diff options
| author | Stephen Hemminger <shemminger@vyatta.com> | 2008-04-10 01:43:09 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-04-10 01:43:09 -0700 |
| commit | 43db6d65e0ef943a361cb91f8baa49132009227b (patch) | |
| tree | 5770f1dac28a209bb6e0c04f5948c454bb6a8733 /include | |
| parent | b715631fad3ed320b85d386a84a6fb0b3f86b0b9 (diff) | |
socket: sk_filter deinline
The sk_filter function is too big to be inlined. This saves 2296 bytes
of text on allyesconfig.
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/filter.h | 1 | ||||
| -rw-r--r-- | include/net/sock.h | 35 |
2 files changed, 1 insertions, 35 deletions
diff --git a/include/linux/filter.h b/include/linux/filter.h index bfc5d319b94..673e5677ebc 100644 --- a/include/linux/filter.h +++ b/include/linux/filter.h @@ -142,6 +142,7 @@ static inline unsigned int sk_filter_len(const struct sk_filter *fp) struct sk_buff; struct sock; +extern int sk_filter(struct sock *sk, struct sk_buff *skb); extern unsigned int sk_run_filter(struct sk_buff *skb, struct sock_filter *filter, int flen); extern int sk_attach_filter(struct sock_fprog *fprog, struct sock *sk); diff --git a/include/net/sock.h b/include/net/sock.h index f4fdd101c9a..09255eae93e 100644 --- a/include/net/sock.h +++ b/include/net/sock.h @@ -928,41 +928,6 @@ extern void sk_common_release(struct sock *sk); extern void sock_init_data(struct socket *sock, struct sock *sk); /** - * sk_filter - run a packet through a socket filter - * @sk: sock associated with &sk_buff - * @skb: buffer to filter - * @needlock: set to 1 if the sock is not locked by caller. - * - * Run the filter code and then cut skb->data to correct size returned by - * sk_run_filter. If pkt_len is 0 we toss packet. If skb->len is smaller - * than pkt_len we keep whole skb->data. This is the socket level - * wrapper to sk_run_filter. It returns 0 if the packet should - * be accepted or -EPERM if the packet should be tossed. - * - */ - -static inline int sk_filter(struct sock *sk, struct sk_buff *skb) -{ - int err; - struct sk_filter *filter; - - err = security_sock_rcv_skb(sk, skb); - if (err) - return err; - - rcu_read_lock_bh(); - filter = rcu_dereference(sk->sk_filter); - if (filter) { - unsigned int pkt_len = sk_run_filter(skb, filter->insns, - filter->len); - err = pkt_len ? pskb_trim(skb, pkt_len) : -EPERM; - } - rcu_read_unlock_bh(); - - return err; -} - -/** * sk_filter_release: Release a socket filter * @sk: socket * @fp: filter to remove |