| Submitter | Wang Chen |
|---|---|
| Date | Nov. 21, 2008, 9:02 a.m. |
| Message ID | <49267939.9090808@cn.fujitsu.com> |
| Download | mbox | patch |
| Permalink | /patch/9968/ |
| State | Accepted |
| Delegated to: | David Miller |
| Headers | show |
Comments
Wang Chen <wangchen@cn.fujitsu.com> writes:
> Krzysztof said that he will take this one, but not.
Actually I did. Not yet made it upstream, right :-(
From: Wang Chen <wangchen@cn.fujitsu.com> Date: Fri, 21 Nov 2008 17:02:49 +0800 > Krzysztof said that he will take this one, but not. > I sent this to Dave again. :) > > 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> Applied. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Krzysztof Halasa said the following on 2008-11-22 8:12: > Wang Chen <wangchen@cn.fujitsu.com> writes: > >> Krzysztof said that he will take this one, but not. > > Actually I did. Not yet made it upstream, right :-( Ooh. I am too impatience to wait you do it ;) Any way, thank you, Krzysztof. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Wang Chen <wangchen@cn.fujitsu.com> writes:
> Any way, thank you, Krzysztof.
Really, thank YOU for your work.
Patch
diff --git a/drivers/net/wan/hdlc_fr.c b/drivers/net/wan/hdlc_fr.c index d3d5055..f1ddd7c 100644 --- a/drivers/net/wan/hdlc_fr.c +++ b/drivers/net/wan/hdlc_fr.c @@ -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 */ @@ -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); @@ -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) { @@ -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) { @@ -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) { diff --git a/include/linux/hdlc.h b/include/linux/hdlc.h index c597696..e960faa 100644 --- a/include/linux/hdlc.h +++ b/include/linux/hdlc.h @@ -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)