diff options
| author | dimitri staessens <[email protected]> | 2016-06-14 15:13:29 +0200 |
|---|---|---|
| committer | dimitri staessens <[email protected]> | 2016-06-14 15:13:29 +0200 |
| commit | af2ab9b56fb4b541abd067c9a6e2b3f62a4c4aab (patch) | |
| tree | 52d1f46a5a8a775a036196ec2800d300214a9f5f | |
| parent | 1a3b2987f2948d63b3febebbf00d2412de8d739a (diff) | |
| parent | b3bf84b1c11ac66ab0806b2d1a89870bec22a86e (diff) | |
| download | ouroboros-af2ab9b56fb4b541abd067c9a6e2b3f62a4c4aab.tar.gz ouroboros-af2ab9b56fb4b541abd067c9a6e2b3f62a4c4aab.zip | |
Merged in sandervrijders/ouroboros/be-llc (pull request #124)
Be llc
| -rwxr-xr-x | install_release.sh | 2 | ||||
| -rw-r--r-- | src/ipcpd/shim-eth-llc/shim_eth_llc_messages.proto | 9 |
2 files changed, 5 insertions, 6 deletions
diff --git a/install_release.sh b/install_release.sh index 8884d65a..cbba45ff 100755 --- a/install_release.sh +++ b/install_release.sh @@ -6,7 +6,7 @@ if (($# == 1 )) then PREFIX=`echo "$1"|sed -e "s,\/$,,"` else - PREFIX="/usr/local/ouroboros" + PREFIX="/usr" fi BUILDDIR=build diff --git a/src/ipcpd/shim-eth-llc/shim_eth_llc_messages.proto b/src/ipcpd/shim-eth-llc/shim_eth_llc_messages.proto index 3ea1af1f..dbad4964 100644 --- a/src/ipcpd/shim-eth-llc/shim_eth_llc_messages.proto +++ b/src/ipcpd/shim-eth-llc/shim_eth_llc_messages.proto @@ -7,9 +7,8 @@ enum shim_eth_llc_msg_code { message shim_eth_llc_msg { required shim_eth_llc_msg_code code = 1; optional string dst_name = 2; - optional string src_ap_name = 3; - optional string src_ae_name = 4; - required sint32 ssap = 5; - optional sint32 dsap = 6; - optional sint32 response = 7; + optional string src_ae_name = 3; + required sint32 ssap = 4; + optional sint32 dsap = 5; + optional sint32 response = 6; }; |