summaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/intel/e1000e
diff options
context:
space:
mode:
authorBruce Allan <bruce.w.allan@intel.com>2013-05-01 03:48:11 +0000
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>2013-05-21 02:13:07 -0700
commit603cdca9805e4f8001cf7ffbd8c539c9fa6674ce (patch)
tree3a78bac73af974363499323a489b296f06fe3737 /drivers/net/ethernet/intel/e1000e
parente80bd1d181ff4601d88cf438817a3a7e84fe6912 (diff)
downloadblackbird-op-linux-603cdca9805e4f8001cf7ffbd8c539c9fa6674ce.tar.gz
blackbird-op-linux-603cdca9805e4f8001cf7ffbd8c539c9fa6674ce.zip
e1000e: prevent warning from -Wunused-parameter
Signed-off-by: Bruce Allan <bruce.w.allan@intel.com> Tested-by: Aaron Brown <aaron.f.brown@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Diffstat (limited to 'drivers/net/ethernet/intel/e1000e')
-rw-r--r--drivers/net/ethernet/intel/e1000e/netdev.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c
index ad5f43476924..77f81cbb601a 100644
--- a/drivers/net/ethernet/intel/e1000e/netdev.c
+++ b/drivers/net/ethernet/intel/e1000e/netdev.c
@@ -2673,7 +2673,7 @@ static int e1000e_poll(struct napi_struct *napi, int weight)
}
static int e1000_vlan_rx_add_vid(struct net_device *netdev,
- __be16 proto, u16 vid)
+ __always_unused __be16 proto, u16 vid)
{
struct e1000_adapter *adapter = netdev_priv(netdev);
struct e1000_hw *hw = &adapter->hw;
@@ -2699,7 +2699,7 @@ static int e1000_vlan_rx_add_vid(struct net_device *netdev,
}
static int e1000_vlan_rx_kill_vid(struct net_device *netdev,
- __be16 proto, u16 vid)
+ __always_unused __be16 proto, u16 vid)
{
struct e1000_adapter *adapter = netdev_priv(netdev);
struct e1000_hw *hw = &adapter->hw;
OpenPOWER on IntegriCloud