aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2010-05-02 05:21:44 -0400
committerDavid S. Miller <davem@davemloft.net>2010-05-02 05:21:44 -0400
commit47d29646a2c1c147d8a7598aeac2c87dd71ed638 (patch)
treeb38f05d82883b5c0fc885812172a546af966d419 /net
parent43815482370c510c569fd18edb57afcb0fa8cab6 (diff)
net: Inline skb_pull() in eth_type_trans().
In commit 6be8ac2f ("[NET]: uninline skb_pull, de-bloats a lot") we uninlined skb_pull. But in some critical paths it makes sense to inline this thing and it helps performance significantly. Create an skb_pull_inline() so that we can do this in a way that serves also as annotation. Based upon a patch by Eric Dumazet. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r--net/core/skbuff.c2
-rw-r--r--net/ethernet/eth.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/net/core/skbuff.c b/net/core/skbuff.c
index 4218ff49bf13..8b9c109166a7 100644
--- a/net/core/skbuff.c
+++ b/net/core/skbuff.c
@@ -1051,7 +1051,7 @@ EXPORT_SYMBOL(skb_push);
1051 */ 1051 */
1052unsigned char *skb_pull(struct sk_buff *skb, unsigned int len) 1052unsigned char *skb_pull(struct sk_buff *skb, unsigned int len)
1053{ 1053{
1054 return unlikely(len > skb->len) ? NULL : __skb_pull(skb, len); 1054 return skb_pull_inline(skb, len);
1055} 1055}
1056EXPORT_SYMBOL(skb_pull); 1056EXPORT_SYMBOL(skb_pull);
1057 1057
diff --git a/net/ethernet/eth.c b/net/ethernet/eth.c
index 0c0d272a9888..61ec0329316c 100644
--- a/net/ethernet/eth.c
+++ b/net/ethernet/eth.c
@@ -162,7 +162,7 @@ __be16 eth_type_trans(struct sk_buff *skb, struct net_device *dev)
162 162
163 skb->dev = dev; 163 skb->dev = dev;
164 skb_reset_mac_header(skb); 164 skb_reset_mac_header(skb);
165 skb_pull(skb, ETH_HLEN); 165 skb_pull_inline(skb, ETH_HLEN);
166 eth = eth_hdr(skb); 166 eth = eth_hdr(skb);
167 167
168 if (unlikely(is_multicast_ether_addr(eth->h_dest))) { 168 if (unlikely(is_multicast_ether_addr(eth->h_dest))) {