aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIlpo Järvinen <ilpo.jarvinen@helsinki.fi>2008-03-27 20:52:40 -0400
committerDavid S. Miller <davem@davemloft.net>2008-03-27 20:52:40 -0400
commitc2aa270ad73d385bd6cdebf5d741bdf18a3e17ad (patch)
tree1e8de0edce4f149a9918505f495550c8ac9bac56
parentf58518e678e5eef430c8d5cdcc7cd28d285f1980 (diff)
[NET]: uninline skb_push, de-bloats a lot
Allyesconfig (v2.6.24-mm1): -21593 356 funcs, 2418 +, 24011 -, diff: -21593 --- skb_push Without many debug related CONFIGs (v2.6.25-rc2-mm1): -13890 341 funcs, 189 +, 14079 -, diff: -13890 --- skb_push skb_push | +46 Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@helsinki.fi> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--include/linux/skbuff.h19
-rw-r--r--net/core/skbuff.c19
2 files changed, 20 insertions, 18 deletions
diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
index 01a11b0c0291..1baf4d43bb2d 100644
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
@@ -902,6 +902,7 @@ static inline unsigned char *__skb_put(struct sk_buff *skb, unsigned int len)
902 return tmp; 902 return tmp;
903} 903}
904 904
905extern unsigned char *skb_push(struct sk_buff *skb, unsigned int len);
905static inline unsigned char *__skb_push(struct sk_buff *skb, unsigned int len) 906static inline unsigned char *__skb_push(struct sk_buff *skb, unsigned int len)
906{ 907{
907 skb->data -= len; 908 skb->data -= len;
@@ -909,24 +910,6 @@ static inline unsigned char *__skb_push(struct sk_buff *skb, unsigned int len)
909 return skb->data; 910 return skb->data;
910} 911}
911 912
912/**
913 * skb_push - add data to the start of a buffer
914 * @skb: buffer to use
915 * @len: amount of data to add
916 *
917 * This function extends the used data area of the buffer at the buffer
918 * start. If this would exceed the total buffer headroom the kernel will
919 * panic. A pointer to the first byte of the extra data is returned.
920 */
921static inline unsigned char *skb_push(struct sk_buff *skb, unsigned int len)
922{
923 skb->data -= len;
924 skb->len += len;
925 if (unlikely(skb->data<skb->head))
926 skb_under_panic(skb, len, current_text_addr());
927 return skb->data;
928}
929
930extern unsigned char *skb_pull(struct sk_buff *skb, unsigned int len); 913extern unsigned char *skb_pull(struct sk_buff *skb, unsigned int len);
931static inline unsigned char *__skb_pull(struct sk_buff *skb, unsigned int len) 914static inline unsigned char *__skb_pull(struct sk_buff *skb, unsigned int len)
932{ 915{
diff --git a/net/core/skbuff.c b/net/core/skbuff.c
index 0daf5c0e5b8d..a37127b5899c 100644
--- a/net/core/skbuff.c
+++ b/net/core/skbuff.c
@@ -897,6 +897,25 @@ unsigned char *skb_put(struct sk_buff *skb, unsigned int len)
897EXPORT_SYMBOL(skb_put); 897EXPORT_SYMBOL(skb_put);
898 898
899/** 899/**
900 * skb_push - add data to the start of a buffer
901 * @skb: buffer to use
902 * @len: amount of data to add
903 *
904 * This function extends the used data area of the buffer at the buffer
905 * start. If this would exceed the total buffer headroom the kernel will
906 * panic. A pointer to the first byte of the extra data is returned.
907 */
908unsigned char *skb_push(struct sk_buff *skb, unsigned int len)
909{
910 skb->data -= len;
911 skb->len += len;
912 if (unlikely(skb->data<skb->head))
913 skb_under_panic(skb, len, __builtin_return_address(0));
914 return skb->data;
915}
916EXPORT_SYMBOL(skb_push);
917
918/**
900 * skb_pull - remove data from the start of a buffer 919 * skb_pull - remove data from the start of a buffer
901 * @skb: buffer to use 920 * @skb: buffer to use
902 * @len: amount of data to remove 921 * @len: amount of data to remove