git.droids-corp.org
/
dpdk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
kni: fix build with kernel 4.8
[dpdk.git]
/
lib
/
librte_eal
/
linuxapp
/
kni
/
ethtool
/
igb
/
igb_main.c
diff --git
a/lib/librte_eal/linuxapp/kni/ethtool/igb/igb_main.c
b/lib/librte_eal/linuxapp/kni/ethtool/igb/igb_main.c
index
47198bb
..
23e2d64
100644
(file)
--- a/
lib/librte_eal/linuxapp/kni/ethtool/igb/igb_main.c
+++ b/
lib/librte_eal/linuxapp/kni/ethtool/igb/igb_main.c
@@
-17,7
+17,7
@@
51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
The full GNU General Public License is included in this distribution in
51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
The full GNU General Public License is included in this distribution in
- the file called "
COPYING
".
+ the file called "
LICENSE.GPL
".
Contact Information:
e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>
Contact Information:
e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>
@@
-76,7
+76,7
@@
static const char igb_driver_string[] =
static const char igb_copyright[] =
"Copyright (c) 2007-2013 Intel Corporation.";
static const char igb_copyright[] =
"Copyright (c) 2007-2013 Intel Corporation.";
-
static DEFINE_PCI_DEVICE_TABLE(igb_pci_tbl)
= {
+
const struct pci_device_id igb_pci_tbl[]
= {
{ PCI_VDEVICE(INTEL, E1000_DEV_ID_I354_BACKPLANE_1GBPS) },
{ PCI_VDEVICE(INTEL, E1000_DEV_ID_I354_SGMII) },
{ PCI_VDEVICE(INTEL, E1000_DEV_ID_I354_BACKPLANE_2_5GBPS) },
{ PCI_VDEVICE(INTEL, E1000_DEV_ID_I354_BACKPLANE_1GBPS) },
{ PCI_VDEVICE(INTEL, E1000_DEV_ID_I354_SGMII) },
{ PCI_VDEVICE(INTEL, E1000_DEV_ID_I354_BACKPLANE_2_5GBPS) },
@@
-1558,6
+1558,7
@@
static void igb_check_swap_media(struct igb_adapter *adapter)
ctrl_ext = E1000_READ_REG(hw, E1000_CTRL_EXT);
connsw = E1000_READ_REG(hw, E1000_CONNSW);
link = igb_has_link(adapter);
ctrl_ext = E1000_READ_REG(hw, E1000_CTRL_EXT);
connsw = E1000_READ_REG(hw, E1000_CONNSW);
link = igb_has_link(adapter);
+ (void) link;
/* need to live swap if current media is copper and we have fiber/serdes
* to go to.
/* need to live swap if current media is copper and we have fiber/serdes
* to go to.
@@
-1628,7
+1629,7
@@
static int igb_get_i2c_data(void *data)
struct e1000_hw *hw = &adapter->hw;
s32 i2cctl = E1000_READ_REG(hw, E1000_I2CPARAMS);
struct e1000_hw *hw = &adapter->hw;
s32 i2cctl = E1000_READ_REG(hw, E1000_I2CPARAMS);
- return (
(i2cctl & E1000_I2C_DATA_IN) != 0)
;
+ return (
i2cctl & E1000_I2C_DATA_IN) != 0
;
}
/* igb_set_i2c_data - Sets the I2C data bit
}
/* igb_set_i2c_data - Sets the I2C data bit
@@
-1690,7
+1691,7
@@
static int igb_get_i2c_clk(void *data)
struct e1000_hw *hw = &adapter->hw;
s32 i2cctl = E1000_READ_REG(hw, E1000_I2CPARAMS);
struct e1000_hw *hw = &adapter->hw;
s32 i2cctl = E1000_READ_REG(hw, E1000_I2CPARAMS);
- return (
(i2cctl & E1000_I2C_CLK_IN) != 0)
;
+ return (
i2cctl & E1000_I2C_CLK_IN) != 0
;
}
static const struct i2c_algo_bit_data igb_i2c_algo = {
}
static const struct i2c_algo_bit_data igb_i2c_algo = {
@@
-2250,14
+2251,14
@@
static int igb_ndo_bridge_setlink(struct net_device *dev,
}
#ifdef HAVE_BRIDGE_FILTER
}
#ifdef HAVE_BRIDGE_FILTER
-#ifdef HAVE_NDO_BRIDGE_GETLINK_
FILTER_MASK
+#ifdef HAVE_NDO_BRIDGE_GETLINK_
NLFLAGS
static int igb_ndo_bridge_getlink(struct sk_buff *skb, u32 pid, u32 seq,
struct net_device *dev, u32 filter_mask,
int nlflags)
#else
static int igb_ndo_bridge_getlink(struct sk_buff *skb, u32 pid, u32 seq,
struct net_device *dev, u32 filter_mask)
static int igb_ndo_bridge_getlink(struct sk_buff *skb, u32 pid, u32 seq,
struct net_device *dev, u32 filter_mask,
int nlflags)
#else
static int igb_ndo_bridge_getlink(struct sk_buff *skb, u32 pid, u32 seq,
struct net_device *dev, u32 filter_mask)
-#endif /* HAVE_NDO_BRIDGE_GETLINK_
FILTER_MASK
*/
+#endif /* HAVE_NDO_BRIDGE_GETLINK_
NLFLAGS
*/
#else
static int igb_ndo_bridge_getlink(struct sk_buff *skb, u32 pid, u32 seq,
struct net_device *dev)
#else
static int igb_ndo_bridge_getlink(struct sk_buff *skb, u32 pid, u32 seq,
struct net_device *dev)
@@
-2274,15
+2275,20
@@
static int igb_ndo_bridge_getlink(struct sk_buff *skb, u32 pid, u32 seq,
else
mode = BRIDGE_MODE_VEPA;
else
mode = BRIDGE_MODE_VEPA;
-#ifdef HAVE_NDO_FDB_ADD_VID
-#ifdef HAVE_NDO_BRIDGE_GETLINK_FILTER_MASK
+#ifdef HAVE_NDO_DFLT_BRIDGE_ADD_MASK
+#ifdef HAVE_NDO_BRIDGE_GETLINK_NLFLAGS
+#ifdef HAVE_NDO_BRIDGE_GETLINK_FILTER_MASK_VLAN_FILL
+ return ndo_dflt_bridge_getlink(skb, pid, seq, dev, mode, 0, 0,
+ nlflags, filter_mask, NULL);
+#else
return ndo_dflt_bridge_getlink(skb, pid, seq, dev, mode, 0, 0, nlflags);
return ndo_dflt_bridge_getlink(skb, pid, seq, dev, mode, 0, 0, nlflags);
+#endif /* HAVE_NDO_BRIDGE_GETLINK_FILTER_MASK_VLAN_FILL */
#else
return ndo_dflt_bridge_getlink(skb, pid, seq, dev, mode, 0, 0);
#else
return ndo_dflt_bridge_getlink(skb, pid, seq, dev, mode, 0, 0);
-#endif /* HAVE_NDO_BRIDGE_GETLINK_
FILTER_MASK
*/
+#endif /* HAVE_NDO_BRIDGE_GETLINK_
NLFLAGS
*/
#else
return ndo_dflt_bridge_getlink(skb, pid, seq, dev, mode);
#else
return ndo_dflt_bridge_getlink(skb, pid, seq, dev, mode);
-#endif /* HAVE_NDO_
FDB_ADD_VID
*/
+#endif /* HAVE_NDO_
DFLT_BRIDGE_ADD_MASK
*/
}
#endif /* HAVE_BRIDGE_ATTRIBS */
#endif /* NTF_SELF */
}
#endif /* HAVE_BRIDGE_ATTRIBS */
#endif /* NTF_SELF */
@@
-3178,8
+3184,8
@@
static int igb_sw_init(struct igb_adapter *adapter)
GFP_ATOMIC);
/* Setup and initialize a copy of the hw vlan table array */
GFP_ATOMIC);
/* Setup and initialize a copy of the hw vlan table array */
- adapter->shadow_vfta =
(u32 *)
kzalloc(sizeof(u32) * E1000_VFTA_ENTRIES,
-
GFP_ATOMIC);
+ adapter->shadow_vfta = kzalloc(sizeof(u32) * E1000_VFTA_ENTRIES,
+ GFP_ATOMIC);
#ifdef NO_KNI
/* These calls may decrease the number of queues */
if (hw->mac.type < e1000_i210) {
#ifdef NO_KNI
/* These calls may decrease the number of queues */
if (hw->mac.type < e1000_i210) {
@@
-8039,7
+8045,7
@@
static bool igb_clean_rx_irq(struct igb_q_vector *q_vector, int budget)
igb_lro_flush_all(q_vector);
#endif /* IGB_NO_LRO */
igb_lro_flush_all(q_vector);
#endif /* IGB_NO_LRO */
- return
(total_packets < budget)
;
+ return
total_packets < budget
;
}
#else /* CONFIG_IGB_DISABLE_PACKET_SPLIT */
/**
}
#else /* CONFIG_IGB_DISABLE_PACKET_SPLIT */
/**
@@
-8347,7
+8353,7
@@
static bool igb_clean_rx_irq(struct igb_q_vector *q_vector, int budget)
igb_lro_flush_all(q_vector);
#endif /* IGB_NO_LRO */
igb_lro_flush_all(q_vector);
#endif /* IGB_NO_LRO */
- return
(total_packets < budget)
;
+ return
total_packets < budget
;
}
#endif /* CONFIG_IGB_DISABLE_PACKET_SPLIT */
}
#endif /* CONFIG_IGB_DISABLE_PACKET_SPLIT */