Since ETHER_MAX_LEN is only used for CDC_MAX_MSG_SIZE, directly use the value in bcmcdc.h and remove the definition. Signed-off-by: Jonas Gorski <jonas.gorski@xxxxxxxxx> --- drivers/staging/brcm80211/include/bcmcdc.h | 3 +-- drivers/staging/brcm80211/include/proto/ethernet.h | 2 -- 2 files changed, 1 insertions(+), 4 deletions(-) diff --git a/drivers/staging/brcm80211/include/bcmcdc.h b/drivers/staging/brcm80211/include/bcmcdc.h index 10c1ddc..e56470e 100644 --- a/drivers/staging/brcm80211/include/bcmcdc.h +++ b/drivers/staging/brcm80211/include/bcmcdc.h @@ -13,7 +13,6 @@ * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#include <proto/ethernet.h> typedef struct cdc_ioctl { u32 cmd; /* ioctl command value */ @@ -24,7 +23,7 @@ typedef struct cdc_ioctl { } cdc_ioctl_t; /* Max valid buffer size that can be sent to the dongle */ -#define CDC_MAX_MSG_SIZE ETHER_MAX_LEN +#define CDC_MAX_MSG_SIZE 1518 /* len field is divided into input and output buffer lengths */ #define CDCL_IOC_OUTLEN_MASK 0x0000FFFF /* maximum or expected diff --git a/drivers/staging/brcm80211/include/proto/ethernet.h b/drivers/staging/brcm80211/include/proto/ethernet.h index 1176df9..bc99842 100644 --- a/drivers/staging/brcm80211/include/proto/ethernet.h +++ b/drivers/staging/brcm80211/include/proto/ethernet.h @@ -21,8 +21,6 @@ #include <packed_section_start.h> -#define ETHER_MAX_LEN 1518 - #define ETHER_TYPE_BRCM 0x886c BWL_PRE_PACKED_STRUCT struct ether_addr { -- 1.5.6.5 -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html