aboutsummaryrefslogtreecommitdiffstats
path: root/net/bluetooth/bnep
diff options
context:
space:
mode:
authorWang Chen <wangchen@cn.fujitsu.com>2008-11-13 02:39:10 -0500
committerDavid S. Miller <davem@davemloft.net>2008-11-13 02:39:10 -0500
commit524ad0a79126efabf58d0a49eace6155ab5b4549 (patch)
tree927e79d7d28d2c563c5beba74f06527df564e31c /net/bluetooth/bnep
parent8f15ea42b64941001a401cf855a0869e24f3a845 (diff)
netdevice: safe convert to netdev_priv() #part-4
We have some reasons to kill netdev->priv: 1. netdev->priv is equal to netdev_priv(). 2. netdev_priv() wraps the calculation of netdev->priv's offset, obviously netdev_priv() is more flexible than netdev->priv. But we cann't kill netdev->priv, because so many drivers reference to it directly. This patch is a safe convert for netdev->priv to netdev_priv(netdev). Since all of the netdev->priv is only for read. But it is too big to be sent in one mail. I split it to 4 parts and make every part smaller than 100,000 bytes, which is max size allowed by vger. Signed-off-by: Wang Chen <wangchen@cn.fujitsu.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/bluetooth/bnep')
-rw-r--r--net/bluetooth/bnep/core.c2
-rw-r--r--net/bluetooth/bnep/netdev.c6
2 files changed, 4 insertions, 4 deletions
diff --git a/net/bluetooth/bnep/core.c b/net/bluetooth/bnep/core.c
index 7a4d5303b4fe..f8efaf35293c 100644
--- a/net/bluetooth/bnep/core.c
+++ b/net/bluetooth/bnep/core.c
@@ -565,7 +565,7 @@ int bnep_add_connection(struct bnep_connadd_req *req, struct socket *sock)
565 goto failed; 565 goto failed;
566 } 566 }
567 567
568 s = dev->priv; 568 s = netdev_priv(dev);
569 569
570 /* This is rx header therefore addresses are swapped. 570 /* This is rx header therefore addresses are swapped.
571 * ie eh.h_dest is our local address. */ 571 * ie eh.h_dest is our local address. */
diff --git a/net/bluetooth/bnep/netdev.c b/net/bluetooth/bnep/netdev.c
index d9fa0ab2c87f..47e179f62e82 100644
--- a/net/bluetooth/bnep/netdev.c
+++ b/net/bluetooth/bnep/netdev.c
@@ -62,14 +62,14 @@ static int bnep_net_close(struct net_device *dev)
62 62
63static struct net_device_stats *bnep_net_get_stats(struct net_device *dev) 63static struct net_device_stats *bnep_net_get_stats(struct net_device *dev)
64{ 64{
65 struct bnep_session *s = dev->priv; 65 struct bnep_session *s = netdev_priv(dev);
66 return &s->stats; 66 return &s->stats;
67} 67}
68 68
69static void bnep_net_set_mc_list(struct net_device *dev) 69static void bnep_net_set_mc_list(struct net_device *dev)
70{ 70{
71#ifdef CONFIG_BT_BNEP_MC_FILTER 71#ifdef CONFIG_BT_BNEP_MC_FILTER
72 struct bnep_session *s = dev->priv; 72 struct bnep_session *s = netdev_priv(dev);
73 struct sock *sk = s->sock->sk; 73 struct sock *sk = s->sock->sk;
74 struct bnep_set_filter_req *r; 74 struct bnep_set_filter_req *r;
75 struct sk_buff *skb; 75 struct sk_buff *skb;
@@ -183,7 +183,7 @@ static inline int bnep_net_proto_filter(struct sk_buff *skb, struct bnep_session
183 183
184static int bnep_net_xmit(struct sk_buff *skb, struct net_device *dev) 184static int bnep_net_xmit(struct sk_buff *skb, struct net_device *dev)
185{ 185{
186 struct bnep_session *s = dev->priv; 186 struct bnep_session *s = netdev_priv(dev);
187 struct sock *sk = s->sock->sk; 187 struct sock *sk = s->sock->sk;
188 188
189 BT_DBG("skb %p, dev %p", skb, dev); 189 BT_DBG("skb %p, dev %p", skb, dev);