From 07ef7764fcb100611964b59cda53192d476312d6 Mon Sep 17 00:00:00 2001 From: Stefan Assmann Date: Wed, 29 Jan 2014 10:19:06 +0100 Subject: [PATCH] backports: igb fixes for linux-3.3 - add IFF_SUPP_NOFCS define - add patches/collateral-evolutions/network/84-ethernet/0008-igb_no_fcs.patch Is there a better way to handle struct sk_buff changes? Signed-off-by: Stefan Assmann Signed-off-by: Hauke Mehrtens --- backport/backport-include/linux/if.h | 4 ++++ .../network/84-ethernet/0008-igb_no_fcs.patch | 16 ++++++++++++++++ 2 files changed, 20 insertions(+) create mode 100644 patches/collateral-evolutions/network/84-ethernet/0008-igb_no_fcs.patch diff --git a/backport/backport-include/linux/if.h b/backport/backport-include/linux/if.h index 8f85b83e635c..f23d2b848c29 100644 --- a/backport/backport-include/linux/if.h +++ b/backport/backport-include/linux/if.h @@ -33,4 +33,8 @@ #define IFF_LIVE_ADDR_CHANGE 0x100000 #endif +#ifndef IFF_SUPP_NOFCS +#define IFF_SUPP_NOFCS 0x80000 /* device supports sending custom FCS */ +#endif + #endif /* _BACKPORT_LINUX_IF_H */ diff --git a/patches/collateral-evolutions/network/84-ethernet/0008-igb_no_fcs.patch b/patches/collateral-evolutions/network/84-ethernet/0008-igb_no_fcs.patch new file mode 100644 index 000000000000..772b3193cc68 --- /dev/null +++ b/patches/collateral-evolutions/network/84-ethernet/0008-igb_no_fcs.patch @@ -0,0 +1,16 @@ +diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c +index fd6a103..a919cfa 100644 +--- a/drivers/net/ethernet/intel/igb/igb_main.c ++++ b/drivers/net/ethernet/intel/igb/igb_main.c +@@ -4691,9 +4691,10 @@ static u32 igb_tx_cmd_type(struct sk_buf + cmd_type |= IGB_SET_FLAG(tx_flags, IGB_TX_FLAGS_TSTAMP, + (E1000_ADVTXD_MAC_TSTAMP)); + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,4,0) + /* insert frame checksum */ + cmd_type ^= IGB_SET_FLAG(skb->no_fcs, 1, E1000_ADVTXD_DCMD_IFCS); +- ++#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(3,4,0) */ + return cmd_type; + } + -- 2.30.2