Skip to content

Commit

Permalink
netdevice hdlc: Convert directly reference of netdev->priv
Browse files Browse the repository at this point in the history
For killing directly reference of netdev->priv, use netdev->ml_priv to replace it.
Because the private pvc data comes from add_pvc() and can't be allocated in
alloc_netdev().

Signed-off-by: Wang Chen <wangchen@cn.fujitsu.com>
Acked-by: Krzysztof Halasa <khc@pm.waw.pl>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Wang Chen authored and David S. Miller committed Nov 22, 2008
1 parent f757fec commit 2baf8a2
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
10 changes: 5 additions & 5 deletions drivers/net/wan/hdlc_fr.c
Original file line number Diff line number Diff line change
Expand Up @@ -342,7 +342,7 @@ static int fr_hard_header(struct sk_buff **skb_p, u16 dlci)

static int pvc_open(struct net_device *dev)
{
pvc_device *pvc = dev->priv;
pvc_device *pvc = dev->ml_priv;

if ((pvc->frad->flags & IFF_UP) == 0)
return -EIO; /* Frad must be UP in order to activate PVC */
Expand All @@ -362,7 +362,7 @@ static int pvc_open(struct net_device *dev)

static int pvc_close(struct net_device *dev)
{
pvc_device *pvc = dev->priv;
pvc_device *pvc = dev->ml_priv;

if (--pvc->open_count == 0) {
hdlc_device *hdlc = dev_to_hdlc(pvc->frad);
Expand All @@ -381,7 +381,7 @@ static int pvc_close(struct net_device *dev)

static int pvc_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
{
pvc_device *pvc = dev->priv;
pvc_device *pvc = dev->ml_priv;
fr_proto_pvc_info info;

if (ifr->ifr_settings.type == IF_GET_PROTO) {
Expand Down Expand Up @@ -409,7 +409,7 @@ static int pvc_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)

static int pvc_xmit(struct sk_buff *skb, struct net_device *dev)
{
pvc_device *pvc = dev->priv;
pvc_device *pvc = dev->ml_priv;

if (pvc->state.active) {
if (dev->type == ARPHRD_ETHER) {
Expand Down Expand Up @@ -1111,7 +1111,7 @@ static int fr_add_pvc(struct net_device *frad, unsigned int dlci, int type)
dev->change_mtu = pvc_change_mtu;
dev->mtu = HDLC_MAX_MTU;
dev->tx_queue_len = 0;
dev->priv = pvc;
dev->ml_priv = pvc;

result = dev_alloc_name(dev, dev->name);
if (result < 0) {
Expand Down
2 changes: 1 addition & 1 deletion include/linux/hdlc.h
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ struct net_device *alloc_hdlcdev(void *priv);

static inline struct hdlc_device* dev_to_hdlc(struct net_device *dev)
{
return dev->priv;
return netdev_priv(dev);
}

static __inline__ void debug_frame(const struct sk_buff *skb)
Expand Down

0 comments on commit 2baf8a2

Please sign in to comment.