From 1ea1be9fa210d584f7e1a4ee10131181b0eda3e4 Mon Sep 17 00:00:00 2001 From: Kevin McKinney Date: Sat, 22 Dec 2012 14:27:43 -0500 Subject: [PATCH] --- yaml --- r: 353815 b: refs/heads/master c: 5a88304e568e0c6176ebd85fc08d535a4f02a97a h: refs/heads/master i: 353813: 0530e31291fba68a402cbfe28ec84c8ddd8c4e46 353811: 8fe75753fafed0d172ce65bbe70ee8f2545ee2a1 353807: c44bbdcee46ec5b31810c6cb8b158796cfb1d56f v: v3 --- [refs] | 2 +- trunk/drivers/staging/bcm/Protocol.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index ca0712e22060..8c184e303d7c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5f8797b64f62662f36814db36409720eac02a5a4 +refs/heads/master: 5a88304e568e0c6176ebd85fc08d535a4f02a97a diff --git a/trunk/drivers/staging/bcm/Protocol.h b/trunk/drivers/staging/bcm/Protocol.h index bb62e1711565..a7028d5f9671 100644 --- a/trunk/drivers/staging/bcm/Protocol.h +++ b/trunk/drivers/staging/bcm/Protocol.h @@ -94,10 +94,10 @@ typedef enum _E_SERVICEFLOW_CS_SPEC_ { #define IP_VERSION(byte) (((byte&0xF0)>>4)) #define MAC_ADDRESS_SIZE 6 -#define ETH_AND_IP_HEADER_LEN 14 + 20 +#define ETH_AND_IP_HEADER_LEN (14 + 20) #define L4_SRC_PORT_LEN 2 #define L4_DEST_PORT_LEN 2 -#define CTRL_PKT_LEN 8 + ETH_AND_IP_HEADER_LEN +#define CTRL_PKT_LEN (8 + ETH_AND_IP_HEADER_LEN) #define ETH_ARP_FRAME 0x806 #define ETH_IPV4_FRAME 0x800