iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

netdevice ppp: Convert directly reference of netdev->priv

Browse Source 
1. Use netdev_priv(dev) to replace dev->priv.
2. Alloc netdev's private data by alloc_netdev().

Signed-off-by: Wang Chen <wangchen@cn.fujitsu.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Wang Chen 2008-11-20 04:24:17 -08:00 committed by David S. Miller
parent f7b29271c3
commit c8019bf3af
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/net/ppp_generic.c
View File

@ -886,7 +886,7 @@ out_chrdev:
static int static int
ppp_start_xmit(struct sk_buff *skb, struct net_device *dev) ppp_start_xmit(struct sk_buff *skb, struct net_device *dev)
{ {
struct ppp *ppp = (struct ppp *) dev->priv; struct ppp *ppp = netdev_priv(dev);
int npi, proto; int npi, proto;
unsigned char *pp; unsigned char *pp;
@ -931,7 +931,7 @@ ppp_start_xmit(struct sk_buff *skb, struct net_device *dev)
static int static int
ppp_net_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) ppp_net_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
{ {
struct ppp *ppp = dev->priv; struct ppp *ppp = netdev_priv(dev);
int err = -EFAULT; int err = -EFAULT;
void __user *addr = (void __user *) ifr->ifr_ifru.ifru_data; void __user *addr = (void __user *) ifr->ifr_ifru.ifru_data;
struct ppp_stats stats; struct ppp_stats stats;
@ -2418,13 +2418,12 @@ ppp_create_interface(int unit, int *retp)
int ret = -ENOMEM; int ret = -ENOMEM;
int i; int i;
ppp = kzalloc(sizeof(struct ppp), GFP_KERNEL); dev = alloc_netdev(sizeof(struct ppp), "", ppp_setup);
if (!ppp)
goto out;
dev = alloc_netdev(0, "", ppp_setup);
if (!dev) if (!dev)
goto out1; goto out1;
ppp = netdev_priv(dev);
ppp->dev = dev;
ppp->mru = PPP_MRU; ppp->mru = PPP_MRU;
init_ppp_file(&ppp->file, INTERFACE); init_ppp_file(&ppp->file, INTERFACE);
ppp->file.hdrlen = PPP_HDRLEN - 2; /* don't count proto bytes */ ppp->file.hdrlen = PPP_HDRLEN - 2; /* don't count proto bytes */
@ -2437,8 +2436,6 @@ ppp_create_interface(int unit, int *retp)
ppp->minseq = -1; ppp->minseq = -1;
skb_queue_head_init(&ppp->mrq); skb_queue_head_init(&ppp->mrq);
#endif /* CONFIG_PPP_MULTILINK */ #endif /* CONFIG_PPP_MULTILINK */
ppp->dev = dev;
dev->priv = ppp;
dev->hard_start_xmit = ppp_start_xmit; dev->hard_start_xmit = ppp_start_xmit;
@ -2476,8 +2473,6 @@ out2:
mutex_unlock(&all_ppp_mutex); mutex_unlock(&all_ppp_mutex);
free_netdev(dev); free_netdev(dev);
out1: out1:
kfree(ppp);
out:
*retp = ret; *retp = ret;
return NULL; return NULL;
} }