diff options
Diffstat (limited to 'net/core/netpoll.c')
-rw-r--r-- | net/core/netpoll.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/core/netpoll.c b/net/core/netpoll.c index 537e01afd81b..4e98ffac3af0 100644 --- a/net/core/netpoll.c +++ b/net/core/netpoll.c | |||
@@ -288,11 +288,11 @@ static int netpoll_owner_active(struct net_device *dev) | |||
288 | return 0; | 288 | return 0; |
289 | } | 289 | } |
290 | 290 | ||
291 | void netpoll_send_skb(struct netpoll *np, struct sk_buff *skb) | 291 | void netpoll_send_skb_on_dev(struct netpoll *np, struct sk_buff *skb, |
292 | struct net_device *dev) | ||
292 | { | 293 | { |
293 | int status = NETDEV_TX_BUSY; | 294 | int status = NETDEV_TX_BUSY; |
294 | unsigned long tries; | 295 | unsigned long tries; |
295 | struct net_device *dev = np->dev; | ||
296 | const struct net_device_ops *ops = dev->netdev_ops; | 296 | const struct net_device_ops *ops = dev->netdev_ops; |
297 | /* It is up to the caller to keep npinfo alive. */ | 297 | /* It is up to the caller to keep npinfo alive. */ |
298 | struct netpoll_info *npinfo = np->dev->npinfo; | 298 | struct netpoll_info *npinfo = np->dev->npinfo; |
@@ -346,7 +346,7 @@ void netpoll_send_skb(struct netpoll *np, struct sk_buff *skb) | |||
346 | schedule_delayed_work(&npinfo->tx_work,0); | 346 | schedule_delayed_work(&npinfo->tx_work,0); |
347 | } | 347 | } |
348 | } | 348 | } |
349 | EXPORT_SYMBOL(netpoll_send_skb); | 349 | EXPORT_SYMBOL(netpoll_send_skb_on_dev); |
350 | 350 | ||
351 | void netpoll_send_udp(struct netpoll *np, const char *msg, int len) | 351 | void netpoll_send_udp(struct netpoll *np, const char *msg, int len) |
352 | { | 352 | { |