diff options
author | Stefan Assmann <sassmann@kpanic.de> | 2014-01-29 10:19:06 +0100 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2014-02-01 00:31:30 +0100 |
commit | 07ef7764fcb100611964b59cda53192d476312d6 (patch) | |
tree | efff942e10c8a8a512a275b49eac8fef6f73eb6c /patches/collateral-evolutions | |
parent | b3c578eba470126a5cda33275b26adb841b803ae (diff) |
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 <sassmann@kpanic.de>
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'patches/collateral-evolutions')
-rw-r--r-- | patches/collateral-evolutions/network/84-ethernet/0008-igb_no_fcs.patch | 16 |
1 files changed, 16 insertions, 0 deletions
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 00000000..772b3193 --- /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; + } + |