remove unused netlink NL_EMULATE_DEV code
Subsystems (2)
PATCH 1/1 remove unused netlink NL_EMULATE_DEV code
NL_EMULATE_DEV handler functions can't ever be set, so let's rip them out too. I realize the other half (netlink_attach()) just came out in 2.6.11-rc1, but what's left behind can't be used at all.
Signed-off-by Chris Wright <[email protected]>
af_netlink.c | 24 +----------------------- 1 files changed, 1 insertion(+), 23 deletions(-)
===== net/netlink/af_netlink.c 1.69 vs edited =====
net/netlink/af_netlink.c +1 -23
@@ -55,10 +55,6 @@ #define Nprintk(a...) -#if defined(CONFIG_NETLINK_DEV ) || defined(CONFIG_NETLINK_DEV_MODULE ) -#define NL_EMULATE_DEV -#endif -struct netlink_opt {u32 pid;
@@ -66,7 +62,6 @@ struct netlink_optu32 dst_pid;unsigned int dst_groups;unsigned long state; -int (*handler)(int unit,struct sk_buff *skb);wait_queue_head_t wait;struct netlink_callback *cb;spinlock_t cb_lock;
@@ -596,10 +591,6 @@ int netlink_attachskb(struct sock *sk, s nlk =nlk_sk (sk); -#ifdef NL_EMULATE_DEV -if (nlk->handler) -return 0 ; -#endif if (atomic_read (&sk->sk_rmem_alloc) > sk->sk_rcvbuf ||test_bit (0 , &nlk->state)) {DECLARE_WAITQUEUE (wait, current);
@@ -639,14 +630,6 @@ int netlink_sendskb(struct sock *sk, strint len = skb->len; nlk =nlk_sk (sk); -#ifdef NL_EMULATE_DEV -if (nlk->handler) { -skb_orphan (skb); - len = nlk->handler (protocol, skb); -sock_put (sk); -return len; - } -#endif skb_queue_tail (&sk->sk_receive_queue, skb); sk->sk_data_ready (sk, len);
@@ -711,12 +694,7 @@ retry:static __inline__int netlink_broadcast_deliver (struct sock *sk,struct sk_buff *skb) {struct netlink_opt *nlk =nlk_sk (sk); -#ifdef NL_EMULATE_DEV -if (nlk->handler) { - nlk->handler (sk->sk_protocol, skb); -return 0 ; - } else -#endif +if (atomic_read (&sk->sk_rmem_alloc) <= sk->sk_rcvbuf && !test_bit (0 , &nlk->state)) {skb_set_owner_r (skb, sk);