diff options
| author | Stephen Hemminger <shemminger@linux-foundation.org> | 2007-04-20 19:40:01 -0400 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2007-04-26 01:29:17 -0400 |
| commit | 0c6fcc8a8cfcc737d05b6be8b2c3e931ef99cfc2 (patch) | |
| tree | 53da0c434b22dba352d34c01b50154a4ce23e564 | |
| parent | 3e6cf558b0098a15d8c360c4eaad3e4d719a555a (diff) | |
[NET] skbuff: skb_store_bits const is backwards
Getting warnings becuase skb_store_bits has skb as constant,
but the function overwrites it. Looks like const was on the
wrong side.
Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | include/linux/skbuff.h | 4 | ||||
| -rw-r--r-- | net/core/skbuff.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h index c413afbe0b..50f6f6a094 100644 --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h | |||
| @@ -1494,8 +1494,8 @@ extern __wsum skb_checksum(const struct sk_buff *skb, int offset, | |||
| 1494 | int len, __wsum csum); | 1494 | int len, __wsum csum); |
| 1495 | extern int skb_copy_bits(const struct sk_buff *skb, int offset, | 1495 | extern int skb_copy_bits(const struct sk_buff *skb, int offset, |
| 1496 | void *to, int len); | 1496 | void *to, int len); |
| 1497 | extern int skb_store_bits(const struct sk_buff *skb, int offset, | 1497 | extern int skb_store_bits(struct sk_buff *skb, int offset, |
| 1498 | void *from, int len); | 1498 | const void *from, int len); |
| 1499 | extern __wsum skb_copy_and_csum_bits(const struct sk_buff *skb, | 1499 | extern __wsum skb_copy_and_csum_bits(const struct sk_buff *skb, |
| 1500 | int offset, u8 *to, int len, | 1500 | int offset, u8 *to, int len, |
| 1501 | __wsum csum); | 1501 | __wsum csum); |
diff --git a/net/core/skbuff.c b/net/core/skbuff.c index c7a1b24b73..6b50d58cce 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c | |||
| @@ -1129,7 +1129,7 @@ fault: | |||
| 1129 | * traversing fragment lists and such. | 1129 | * traversing fragment lists and such. |
| 1130 | */ | 1130 | */ |
| 1131 | 1131 | ||
| 1132 | int skb_store_bits(const struct sk_buff *skb, int offset, void *from, int len) | 1132 | int skb_store_bits(struct sk_buff *skb, int offset, const void *from, int len) |
| 1133 | { | 1133 | { |
| 1134 | int i, copy; | 1134 | int i, copy; |
| 1135 | int start = skb_headlen(skb); | 1135 | int start = skb_headlen(skb); |
