summaryrefslogtreecommitdiffstats
path: root/drivers/net/xen-netfront.c
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2015-04-17 15:45:04 +0200
committerDavid S. Miller <davem@davemloft.net>2015-04-17 13:29:41 -0400
commit8b86a61da37cbbcf4bd6e87fda494a59b1cf16c4 (patch)
treefec6ffc220694635ce6b81e67507090be8446ab1 /drivers/net/xen-netfront.c
parentf40ae91307c275fc8b17420fa74145e9937c3c0b (diff)
downloadlinux-stable-8b86a61da37cbbcf4bd6e87fda494a59b1cf16c4.tar.gz
linux-stable-8b86a61da37cbbcf4bd6e87fda494a59b1cf16c4.tar.bz2
linux-stable-8b86a61da37cbbcf4bd6e87fda494a59b1cf16c4.zip
net: remove unused 'dev' argument from netif_needs_gso()
In commit 04ffcb255f22 ("net: Add ndo_gso_check") Tom originally added the 'dev' argument to be able to call ndo_gso_check(). Then later, when generalizing this in commit 5f35227ea34b ("net: Generalize ndo_gso_check to ndo_features_check") Jesse removed the call to ndo_gso_check() in netif_needs_gso() by calling the new ndo_features_check() in a different place. This made the 'dev' argument unused. Remove the unused argument and go back to the code as before. Cc: Tom Herbert <therbert@google.com> Cc: Jesse Gross <jesse@nicira.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/xen-netfront.c')
-rw-r--r--drivers/net/xen-netfront.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/xen-netfront.c b/drivers/net/xen-netfront.c
index 720aaf6313d2..8dcf31063e9a 100644
--- a/drivers/net/xen-netfront.c
+++ b/drivers/net/xen-netfront.c
@@ -560,7 +560,7 @@ static int xennet_start_xmit(struct sk_buff *skb, struct net_device *dev)
if (unlikely(!netif_carrier_ok(dev) ||
(slots > 1 && !xennet_can_sg(dev)) ||
- netif_needs_gso(dev, skb, netif_skb_features(skb)))) {
+ netif_needs_gso(skb, netif_skb_features(skb)))) {
spin_unlock_irqrestore(&queue->tx_lock, flags);
goto drop;
}