- add IFF_UNICAST_FLT define - add PCI_DEV_FLAGS_ASSIGNED define - add skb_frag_size_sub() - add skb_frag_address() - add patches/collateral-evolutions/network/82-ethernet/0011-igb_ethtool_ops.patch - add patches/collateral-evolutions/network/82-ethernet/0012-igb_ndo_set_vf_spoofchk.patch
Signed-off-by: Stefan Assmann <[email protected]> --- backport/backport-include/linux/if.h | 4 ++ backport/backport-include/linux/pci.h | 8 ++++ backport/backport-include/linux/skbuff.h | 19 ++++++++ .../network/82-ethernet/0011-igb_ethtool_ops.patch | 31 +++++++++++++ .../82-ethernet/0012-igb_ndo_set_vf_spoofchk.patch | 51 ++++++++++++++++++++++ 5 files changed, 113 insertions(+) create mode 100644 patches/collateral-evolutions/network/82-ethernet/0011-igb_ethtool_ops.patch create mode 100644 patches/collateral-evolutions/network/82-ethernet/0012-igb_ndo_set_vf_spoofchk.patch diff --git a/backport/backport-include/linux/if.h b/backport/backport-include/linux/if.h index f23d2b8..a072579 100644 --- a/backport/backport-include/linux/if.h +++ b/backport/backport-include/linux/if.h @@ -37,4 +37,8 @@ #define IFF_SUPP_NOFCS 0x80000 /* device supports sending custom FCS */ #endif +#ifndef IFF_UNICAST_FLT +#define IFF_UNICAST_FLT 0x20000 /* Supports unicast filtering */ +#endif + #endif /* _BACKPORT_LINUX_IF_H */ diff --git a/backport/backport-include/linux/pci.h b/backport/backport-include/linux/pci.h index 65a76a1..2c98a99 100644 --- a/backport/backport-include/linux/pci.h +++ b/backport/backport-include/linux/pci.h @@ -178,6 +178,14 @@ bool pci_pme_capable(struct pci_dev *dev, pci_power_t state); .subvendor = (subvend), .subdevice = (subdev) #endif /* PCI_DEVICE_SUB */ +#if LINUX_VERSION_CODE < KERNEL_VERSION(3,2,0) +enum backport_pci_dev_flags { + /* Provide indication device is assigned by a Virtual Machine Manager */ + PCI_DEV_FLAGS_ASSIGNED = (__force pci_dev_flags_t) 4, +}; +#define pci_dev_flags LINUX_BACKPORT(pci_dev_flags); +#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,2,0) */ + #if LINUX_VERSION_CODE < KERNEL_VERSION(3,8,0) int pci_sriov_set_totalvfs(struct pci_dev *dev, u16 numvfs); #endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,8,0) */ diff --git a/backport/backport-include/linux/skbuff.h b/backport/backport-include/linux/skbuff.h index c1b2753..2207e7e 100644 --- a/backport/backport-include/linux/skbuff.h +++ b/backport/backport-include/linux/skbuff.h @@ -224,6 +224,25 @@ static inline void skb_queue_splice_tail(const struct sk_buff_head *list, skb = skb->next) #endif /* < 2.6.28 */ +#if LINUX_VERSION_CODE < KERNEL_VERSION(3,2,0) +static inline void skb_frag_size_sub(skb_frag_t *frag, int delta) +{ + frag->size -= delta; +} + +/** + * skb_frag_address - gets the address of the data contained in a paged fragment + * @frag: the paged fragment buffer + * + * Returns the address of the data within @frag. The page must already + * be mapped. + */ +static inline void *skb_frag_address(const skb_frag_t *frag) +{ + return page_address(skb_frag_page(frag)) + frag->page_offset; +} +#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,2,0) */ + #if LINUX_VERSION_CODE >= KERNEL_VERSION(3,0,0) && LINUX_VERSION_CODE < KERNEL_VERSION(3,6,0) /** * __skb_alloc_pages - allocate pages for ps-rx on a skb and preserve pfmemalloc data diff --git a/patches/collateral-evolutions/network/82-ethernet/0011-igb_ethtool_ops.patch b/patches/collateral-evolutions/network/82-ethernet/0011-igb_ethtool_ops.patch new file mode 100644 index 0000000..de1d07c --- /dev/null +++ b/patches/collateral-evolutions/network/82-ethernet/0011-igb_ethtool_ops.patch @@ -0,0 +1,31 @@ +diff --git a/drivers/net/ethernet/intel/igb/igb_ethtool.c b/drivers/net/ethernet/intel/igb/igb_ethtool.c +index 5e519ce..9f61f1d 100644 +--- a/drivers/net/ethernet/intel/igb/igb_ethtool.c ++++ b/drivers/net/ethernet/intel/igb/igb_ethtool.c +@@ -2408,6 +2408,7 @@ static int igb_get_ts_info(struct net_device *dev, + } + #endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(3,5,0) */ + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,2,0) + static int igb_get_rss_hash_opts(struct igb_adapter *adapter, + struct ethtool_rxnfc *cmd) + { +@@ -2586,6 +2587,7 @@ static int igb_set_rxnfc(struct net_device *dev, struct ethtool_rxnfc *cmd) + + return ret; + } ++#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(3,2,0) */ + + #if LINUX_VERSION_CODE >= KERNEL_VERSION(3,6,0) + static int igb_get_eee(struct net_device *netdev, struct ethtool_eee *edata) +@@ -3011,8 +3013,10 @@ static const struct ethtool_ops igb_ethtool_ops = { + #if LINUX_VERSION_CODE >= KERNEL_VERSION(3,5,0) + .get_ts_info = igb_get_ts_info, + #endif ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,2,0) + .get_rxnfc = igb_get_rxnfc, + .set_rxnfc = igb_set_rxnfc, ++#endif + #if LINUX_VERSION_CODE >= KERNEL_VERSION(3,6,0) + .get_eee = igb_get_eee, + .set_eee = igb_set_eee, diff --git a/patches/collateral-evolutions/network/82-ethernet/0012-igb_ndo_set_vf_spoofchk.patch b/patches/collateral-evolutions/network/82-ethernet/0012-igb_ndo_set_vf_spoofchk.patch new file mode 100644 index 0000000..c6a6bc3 --- /dev/null +++ b/patches/collateral-evolutions/network/82-ethernet/0012-igb_ndo_set_vf_spoofchk.patch @@ -0,0 +1,51 @@ +diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c +index 35ac7d8..e609f71 100644 +--- a/drivers/net/ethernet/intel/igb/igb_main.c ++++ b/drivers/net/ethernet/intel/igb/igb_main.c +@@ -182,8 +182,10 @@ static int igb_ndo_set_vf_mac(struct net_device *netdev, int vf, u8 *mac); + static int igb_ndo_set_vf_vlan(struct net_device *netdev, + int vf, u16 vlan, u8 qos); + static int igb_ndo_set_vf_bw(struct net_device *netdev, int vf, int tx_rate); ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,2,0) + static int igb_ndo_set_vf_spoofchk(struct net_device *netdev, int vf, + bool setting); ++#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(3,2,0) */ + static int igb_ndo_get_vf_config(struct net_device *netdev, int vf, + struct ifla_vf_info *ivi); + static void igb_check_vf_rate_limit(struct igb_adapter *); +@@ -1934,7 +1936,9 @@ static const struct net_device_ops igb_netdev_ops = { + .ndo_set_vf_mac = igb_ndo_set_vf_mac, + .ndo_set_vf_vlan = igb_ndo_set_vf_vlan, + .ndo_set_vf_tx_rate = igb_ndo_set_vf_bw, ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,2,0) + .ndo_set_vf_spoofchk = igb_ndo_set_vf_spoofchk, ++#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(3,2,0) */ + .ndo_get_vf_config = igb_ndo_get_vf_config, + #ifdef CONFIG_NET_POLL_CONTROLLER + .ndo_poll_controller = igb_netpoll, +@@ -7645,6 +7649,7 @@ static int igb_ndo_set_vf_bw(struct net_device *netdev, int vf, int tx_rate) + return 0; + } + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,2,0) + static int igb_ndo_set_vf_spoofchk(struct net_device *netdev, int vf, + bool setting) + { +@@ -7671,6 +7676,7 @@ static int igb_ndo_set_vf_spoofchk(struct net_device *netdev, int vf, + adapter->vf_data[vf].spoofchk_enabled = setting; + return E1000_SUCCESS; + } ++#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(3,2,0) */ + + static int igb_ndo_get_vf_config(struct net_device *netdev, + int vf, struct ifla_vf_info *ivi) +@@ -7683,7 +7689,9 @@ static int igb_ndo_get_vf_config(struct net_device *netdev, + ivi->tx_rate = adapter->vf_data[vf].tx_rate; + ivi->vlan = adapter->vf_data[vf].pf_vlan; + ivi->qos = adapter->vf_data[vf].pf_qos; ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,2,0) + ivi->spoofchk = adapter->vf_data[vf].spoofchk_enabled; ++#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(3,2,0) */ + return 0; + } + -- 1.8.4.2 -- To unsubscribe from this list: send the line "unsubscribe backports" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
