Skip to content

Commit

Permalink
netpoll: move netpoll_send_skb() out of line
Browse files Browse the repository at this point in the history
There is no need to inline this helper, as we intend to add more
code in this function.

Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Eric Dumazet authored and David S. Miller committed May 8, 2020
1 parent 307f660 commit fb1eee4
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 10 deletions.
9 changes: 1 addition & 8 deletions include/linux/netpoll.h
Original file line number Diff line number Diff line change
Expand Up @@ -63,14 +63,7 @@ int netpoll_setup(struct netpoll *np);
void __netpoll_cleanup(struct netpoll *np);
void __netpoll_free(struct netpoll *np);
void netpoll_cleanup(struct netpoll *np);
void __netpoll_send_skb(struct netpoll *np, struct sk_buff *skb);
static inline void netpoll_send_skb(struct netpoll *np, struct sk_buff *skb)
{
unsigned long flags;
local_irq_save(flags);
__netpoll_send_skb(np, skb);
local_irq_restore(flags);
}
void netpoll_send_skb(struct netpoll *np, struct sk_buff *skb);

#ifdef CONFIG_NETPOLL
static inline void *netpoll_poll_lock(struct napi_struct *napi)
Expand Down
13 changes: 11 additions & 2 deletions net/core/netpoll.c
Original file line number Diff line number Diff line change
Expand Up @@ -305,7 +305,7 @@ static int netpoll_owner_active(struct net_device *dev)
}

/* call with IRQ disabled */
void __netpoll_send_skb(struct netpoll *np, struct sk_buff *skb)
static void __netpoll_send_skb(struct netpoll *np, struct sk_buff *skb)
{
netdev_tx_t status = NETDEV_TX_BUSY;
struct net_device *dev;
Expand Down Expand Up @@ -360,7 +360,16 @@ void __netpoll_send_skb(struct netpoll *np, struct sk_buff *skb)
schedule_delayed_work(&npinfo->tx_work,0);
}
}
EXPORT_SYMBOL(__netpoll_send_skb);

void netpoll_send_skb(struct netpoll *np, struct sk_buff *skb)
{
unsigned long flags;

local_irq_save(flags);
__netpoll_send_skb(np, skb);
local_irq_restore(flags);
}
EXPORT_SYMBOL(netpoll_send_skb);

void netpoll_send_udp(struct netpoll *np, const char *msg, int len)
{
Expand Down

0 comments on commit fb1eee4

Please sign in to comment.