diff options
author | Eric Dumazet <eric.dumazet@gmail.com> | 2010-12-06 15:50:09 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-12-08 13:30:34 -0500 |
commit | 62ab0812137ec4f9884dd7de346238841ac03283 (patch) | |
tree | da0807aee4597522b0ecabc51d2d9fc300895d98 /net/core | |
parent | 38f49e8801565674c424896c3dcb4228410b43a8 (diff) |
filter: constify sk_run_filter()
sk_run_filter() doesnt write on skb, change its prototype to reflect
this.
Fix two af_packet comments.
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/core')
-rw-r--r-- | net/core/filter.c | 7 | ||||
-rw-r--r-- | net/core/timestamping.c | 2 |
2 files changed, 5 insertions, 4 deletions
diff --git a/net/core/filter.c b/net/core/filter.c index ac4920a87be5..25500f16a18a 100644 --- a/net/core/filter.c +++ b/net/core/filter.c | |||
@@ -88,7 +88,7 @@ enum { | |||
88 | }; | 88 | }; |
89 | 89 | ||
90 | /* No hurry in this branch */ | 90 | /* No hurry in this branch */ |
91 | static void *__load_pointer(struct sk_buff *skb, int k) | 91 | static void *__load_pointer(const struct sk_buff *skb, int k) |
92 | { | 92 | { |
93 | u8 *ptr = NULL; | 93 | u8 *ptr = NULL; |
94 | 94 | ||
@@ -102,7 +102,7 @@ static void *__load_pointer(struct sk_buff *skb, int k) | |||
102 | return NULL; | 102 | return NULL; |
103 | } | 103 | } |
104 | 104 | ||
105 | static inline void *load_pointer(struct sk_buff *skb, int k, | 105 | static inline void *load_pointer(const struct sk_buff *skb, int k, |
106 | unsigned int size, void *buffer) | 106 | unsigned int size, void *buffer) |
107 | { | 107 | { |
108 | if (k >= 0) | 108 | if (k >= 0) |
@@ -160,7 +160,8 @@ EXPORT_SYMBOL(sk_filter); | |||
160 | * and last instruction guaranteed to be a RET, we dont need to check | 160 | * and last instruction guaranteed to be a RET, we dont need to check |
161 | * flen. (We used to pass to this function the length of filter) | 161 | * flen. (We used to pass to this function the length of filter) |
162 | */ | 162 | */ |
163 | unsigned int sk_run_filter(struct sk_buff *skb, const struct sock_filter *fentry) | 163 | unsigned int sk_run_filter(const struct sk_buff *skb, |
164 | const struct sock_filter *fentry) | ||
164 | { | 165 | { |
165 | void *ptr; | 166 | void *ptr; |
166 | u32 A = 0; /* Accumulator */ | 167 | u32 A = 0; /* Accumulator */ |
diff --git a/net/core/timestamping.c b/net/core/timestamping.c index dac7ed687f60..b124d28ff1c8 100644 --- a/net/core/timestamping.c +++ b/net/core/timestamping.c | |||
@@ -26,7 +26,7 @@ static struct sock_filter ptp_filter[] = { | |||
26 | PTP_FILTER | 26 | PTP_FILTER |
27 | }; | 27 | }; |
28 | 28 | ||
29 | static unsigned int classify(struct sk_buff *skb) | 29 | static unsigned int classify(const struct sk_buff *skb) |
30 | { | 30 | { |
31 | if (likely(skb->dev && | 31 | if (likely(skb->dev && |
32 | skb->dev->phydev && | 32 | skb->dev->phydev && |