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>
This commit is contained in:

committed by
David S. Miller

parent
8f15ea42b6
commit
524ad0a791
@@ -565,7 +565,7 @@ int bnep_add_connection(struct bnep_connadd_req *req, struct socket *sock)
|
||||
goto failed;
|
||||
}
|
||||
|
||||
s = dev->priv;
|
||||
s = netdev_priv(dev);
|
||||
|
||||
/* This is rx header therefore addresses are swapped.
|
||||
* ie eh.h_dest is our local address. */
|
||||
|
@@ -62,14 +62,14 @@ static int bnep_net_close(struct net_device *dev)
|
||||
|
||||
static struct net_device_stats *bnep_net_get_stats(struct net_device *dev)
|
||||
{
|
||||
struct bnep_session *s = dev->priv;
|
||||
struct bnep_session *s = netdev_priv(dev);
|
||||
return &s->stats;
|
||||
}
|
||||
|
||||
static void bnep_net_set_mc_list(struct net_device *dev)
|
||||
{
|
||||
#ifdef CONFIG_BT_BNEP_MC_FILTER
|
||||
struct bnep_session *s = dev->priv;
|
||||
struct bnep_session *s = netdev_priv(dev);
|
||||
struct sock *sk = s->sock->sk;
|
||||
struct bnep_set_filter_req *r;
|
||||
struct sk_buff *skb;
|
||||
@@ -183,7 +183,7 @@ static inline int bnep_net_proto_filter(struct sk_buff *skb, struct bnep_session
|
||||
|
||||
static int bnep_net_xmit(struct sk_buff *skb, struct net_device *dev)
|
||||
{
|
||||
struct bnep_session *s = dev->priv;
|
||||
struct bnep_session *s = netdev_priv(dev);
|
||||
struct sock *sk = s->sock->sk;
|
||||
|
||||
BT_DBG("skb %p, dev %p", skb, dev);
|
||||
|
Reference in New Issue
Block a user