diff options
| author | Rami Rosen <ramirose@gmail.com> | 2010-04-21 01:39:53 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-04-21 01:39:53 -0400 |
| commit | ccb7c7732e2ceb4e81a7806faf1670be9681ccd2 (patch) | |
| tree | 76508ab431133ca9a085a9e3fa62fbfed607c9fb | |
| parent | 0eae88f31ca2b88911ce843452054139e028771f (diff) | |
net: Remove two unnecessary exports (skbuff).
There is no need to export skb_under_panic() and skb_over_panic() in
skbuff.c, since these methods are used only in skbuff.c ; this patch
removes these two exports. It also marks these functions as 'static'
and removeS the extern declarations of them from
include/linux/skbuff.h
Signed-off-by: Rami Rosen <ramirose@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | include/linux/skbuff.h | 4 | ||||
| -rw-r--r-- | net/core/skbuff.c | 6 |
2 files changed, 2 insertions, 8 deletions
diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h index 38501d20650c..82f5116a89e4 100644 --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h | |||
| @@ -470,10 +470,6 @@ extern int skb_cow_data(struct sk_buff *skb, int tailbits, | |||
| 470 | struct sk_buff **trailer); | 470 | struct sk_buff **trailer); |
| 471 | extern int skb_pad(struct sk_buff *skb, int pad); | 471 | extern int skb_pad(struct sk_buff *skb, int pad); |
| 472 | #define dev_kfree_skb(a) consume_skb(a) | 472 | #define dev_kfree_skb(a) consume_skb(a) |
| 473 | extern void skb_over_panic(struct sk_buff *skb, int len, | ||
| 474 | void *here); | ||
| 475 | extern void skb_under_panic(struct sk_buff *skb, int len, | ||
| 476 | void *here); | ||
| 477 | 473 | ||
| 478 | extern int skb_append_datato_frags(struct sock *sk, struct sk_buff *skb, | 474 | extern int skb_append_datato_frags(struct sock *sk, struct sk_buff *skb, |
| 479 | int getfrag(void *from, char *to, int offset, | 475 | int getfrag(void *from, char *to, int offset, |
diff --git a/net/core/skbuff.c b/net/core/skbuff.c index bdea0efdf8cb..4218ff49bf13 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c | |||
| @@ -117,7 +117,7 @@ static const struct pipe_buf_operations sock_pipe_buf_ops = { | |||
| 117 | * | 117 | * |
| 118 | * Out of line support code for skb_put(). Not user callable. | 118 | * Out of line support code for skb_put(). Not user callable. |
| 119 | */ | 119 | */ |
| 120 | void skb_over_panic(struct sk_buff *skb, int sz, void *here) | 120 | static void skb_over_panic(struct sk_buff *skb, int sz, void *here) |
| 121 | { | 121 | { |
| 122 | printk(KERN_EMERG "skb_over_panic: text:%p len:%d put:%d head:%p " | 122 | printk(KERN_EMERG "skb_over_panic: text:%p len:%d put:%d head:%p " |
| 123 | "data:%p tail:%#lx end:%#lx dev:%s\n", | 123 | "data:%p tail:%#lx end:%#lx dev:%s\n", |
| @@ -126,7 +126,6 @@ void skb_over_panic(struct sk_buff *skb, int sz, void *here) | |||
| 126 | skb->dev ? skb->dev->name : "<NULL>"); | 126 | skb->dev ? skb->dev->name : "<NULL>"); |
| 127 | BUG(); | 127 | BUG(); |
| 128 | } | 128 | } |
| 129 | EXPORT_SYMBOL(skb_over_panic); | ||
| 130 | 129 | ||
| 131 | /** | 130 | /** |
| 132 | * skb_under_panic - private function | 131 | * skb_under_panic - private function |
| @@ -137,7 +136,7 @@ EXPORT_SYMBOL(skb_over_panic); | |||
| 137 | * Out of line support code for skb_push(). Not user callable. | 136 | * Out of line support code for skb_push(). Not user callable. |
| 138 | */ | 137 | */ |
| 139 | 138 | ||
| 140 | void skb_under_panic(struct sk_buff *skb, int sz, void *here) | 139 | static void skb_under_panic(struct sk_buff *skb, int sz, void *here) |
| 141 | { | 140 | { |
| 142 | printk(KERN_EMERG "skb_under_panic: text:%p len:%d put:%d head:%p " | 141 | printk(KERN_EMERG "skb_under_panic: text:%p len:%d put:%d head:%p " |
| 143 | "data:%p tail:%#lx end:%#lx dev:%s\n", | 142 | "data:%p tail:%#lx end:%#lx dev:%s\n", |
| @@ -146,7 +145,6 @@ void skb_under_panic(struct sk_buff *skb, int sz, void *here) | |||
| 146 | skb->dev ? skb->dev->name : "<NULL>"); | 145 | skb->dev ? skb->dev->name : "<NULL>"); |
| 147 | BUG(); | 146 | BUG(); |
| 148 | } | 147 | } |
| 149 | EXPORT_SYMBOL(skb_under_panic); | ||
| 150 | 148 | ||
| 151 | /* Allocate a new skbuff. We do this ourselves so we can fill in a few | 149 | /* Allocate a new skbuff. We do this ourselves so we can fill in a few |
| 152 | * 'private' fields and also do memory statistics to find all the | 150 | * 'private' fields and also do memory statistics to find all the |
