Generic HDLC - three patches
Subsystems (4)
Krzysztof Halasa
maintainerHi Jeff,
Three patches - the first one fixes kernel panic in Frame Relay mode (regression present in 2.6.23 and 2.6.24, noticed only recently). The second one removes now unneeded struct proliferation. The third one - Ethernet encapsulations now use random_ether_addr() instead of my old invention.
PPP (hdlc_ppp using syncppp) is still broken (by the same change as FR), I guess the correct fix now is rewriting syncppp (for hdlc_ppp use). No ETA :-(
Tested in action.
Signature · 1 line
Krzysztof Halasa
Krzysztof Halasa
maintainerPATCH 1/3 Generic HDLC - fix kernel panic
Fixes kernel panic in Frame Relay mode
drivers/net/wan/hdlc_fr.c +18 -20
@@ -135,6 +135,10 @@ typedef struct pvc_device_struct { }state; }pvc_device; +struct pvc_desc { +struct net_device_stats stats; +pvc_device *pvc; +};struct frad_state {fr_proto settings;
@@ -170,17 +174,20 @@ static inline void dlci_to_q922(u8 *hdr, u16 dlci) } -static inline struct frad_state *state (hdlc_device *hdlc) +static inline struct frad_state *state (hdlc_device *hdlc) {return (struct frad_state *)(hdlc->state); } - -static __inline__pvc_device *dev_to_pvc (struct net_device *dev) +static inline struct pvc_desc *pvcdev_to_desc (struct net_device *dev) {return dev->priv; } +static inline struct net_device_stats *pvc_get_stats (struct net_device *dev) +{ +return &pvcdev_to_desc (dev)->stats; +}static inline pvc_device *find_pvc (hdlc_device *hdlc,u16 dlci) {
@@ -350,7 +357,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_to_pvc (dev); +pvc_device *pvc =pvcdev_to_desc (dev)->pvc;if ((pvc->frad->flags &IFF_UP ) ==0 )return -EIO ;/* Frad must be UP in order to activate PVC */
@@ -370,7 +377,7 @@ static int pvc_open(struct net_device *dev)static int pvc_close (struct net_device *dev) { -pvc_device *pvc =dev_to_pvc (dev); +pvc_device *pvc =pvcdev_to_desc (dev)->pvc;if (--pvc->open_count ==0 ) {hdlc_device *hdlc =dev_to_hdlc (pvc->frad);
@@ -389,7 +396,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_to_pvc (dev); +pvc_device *pvc =pvcdev_to_desc (dev)->pvc;fr_proto_pvc_info info;if (ifr->ifr_settings.type ==IF_GET_PROTO ) {
@@ -415,17 +422,9 @@ static int pvc_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)return -EINVAL ; } - -static inline struct net_device_stats *pvc_get_stats (struct net_device *dev) -{ -return &dev_to_desc (dev)->stats; -} - - -static int pvc_xmit (struct sk_buff *skb,struct net_device *dev) { -pvc_device *pvc =dev_to_pvc (dev); +pvc_device *pvc =pvcdev_to_desc (dev)->pvc;struct net_device_stats *stats =pvc_get_stats (dev);if (pvc->state.active) {
@@ -1108,11 +1107,10 @@ static int fr_add_pvc(struct net_device *frad, unsigned int dlci, int type) used =pvc_is_used (pvc);if (type ==ARPHRD_ETHER ) - dev =alloc_netdev (sizeof (struct net_device_stats ), -"pvceth%d" , ether_setup); + dev =alloc_netdev (sizeof (struct pvc_desc ),"pvceth%d" , + ether_setup);else - dev =alloc_netdev (sizeof (struct net_device_stats ), -"pvc%d" , pvc_setup); + dev =alloc_netdev (sizeof (struct pvc_desc ),"pvc%d" , pvc_setup);if (!dev) { printk(KERN_WARNING "%s: Memory squeeze on fr_pvc()\n",
@@ -1135,7 +1133,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; +pvcdev_to_desc (dev)->pvc = pvc; result =dev_alloc_name (dev, dev->name);if (result <0 ) {
Re: [PATCH 1/3] Generic HDLC - fix kernel panic
Quoted 3 lines · Krzysztof Halasa
Fixes kernel panic in Frame Relay mode
Signed-off-by Krzysztof Halasa <[email protected]>
applied 1-3
Krzysztof Halasa
maintainerPATCH 2/3 Generic HDLC - remove now unneeded hdlc_device_desc
In reply to Krzysztof HalasaRemoves now unneeded struct hdlc_device_desc
drivers/net/wan/hdlc.c +9 -15
@@ -1,7 +1,7 @@/* * Generic HDLC support routines for Linux * -* Copyright (C) 1999 - 2006 Krzysztof Halasa <[email protected]> +* Copyright (C) 1999 - 2008 Krzysztof Halasa <[email protected]> * * This program is free software; you can redistribute it and/or modify it * under the terms of version 2 of the GNU General Public License
@@ -39,7 +39,7 @@#include <net/net_namespace.h> -static const char * version ="HDLC support module revision 1.21" ; +static const char * version ="HDLC support module revision 1.22" ;#undef DEBUG_LINK
@@ -66,19 +66,15 @@ static struct net_device_stats *hdlc_get_stats(struct net_device *dev)static int hdlc_rcv (struct sk_buff *skb,struct net_device *dev,struct packet_type *p,struct net_device *orig_dev) { -struct hdlc_device_desc *desc =dev_to_desc (dev); +struct hdlc_device *hdlc =dev_to_hdlc (dev);if (dev->nd_net != &init_net) {kfree_skb (skb);return 0 ; } -if (desc->netif_rx) -return desc->netif_rx (skb); - - desc->stats.rx_dropped++;/* Shouldn't happen */ -dev_kfree_skb (skb); -return NET_RX_DROP ; +BUG_ON (!hdlc->proto->netif_rx); +return hdlc->proto->netif_rx (skb); }
@@ -87,7 +83,7 @@ static inline void hdlc_proto_start(struct net_device *dev) {hdlc_device *hdlc =dev_to_hdlc (dev);if (hdlc->proto->start) -return hdlc->proto->start (dev); + hdlc->proto->start (dev); }
@@ -96,7 +92,7 @@ static inline void hdlc_proto_stop(struct net_device *dev) {hdlc_device *hdlc =dev_to_hdlc (dev);if (hdlc->proto->stop) -return hdlc->proto->stop (dev); + hdlc->proto->stop (dev); }
@@ -263,8 +259,7 @@ static void hdlc_setup(struct net_device *dev)struct net_device *alloc_hdlcdev (void *priv) {struct net_device *dev; - dev =alloc_netdev (sizeof (struct hdlc_device_desc ) + -sizeof (hdlc_device),"hdlc%d" , hdlc_setup); + dev =alloc_netdev (sizeof (struct hdlc_device ),"hdlc%d" , hdlc_setup);if (dev)dev_to_hdlc (dev)->priv = priv;return dev;
@@ -281,7 +276,7 @@ void unregister_hdlc_device(struct net_device *dev)int attach_hdlc_protocol (struct net_device *dev,struct hdlc_proto *proto, -int (*rx)(struct sk_buff *skb),size_t size) +size_t size) {detach_hdlc_protocol (dev);
@@ -297,7 +292,6 @@ int attach_hdlc_protocol(struct net_device *dev, struct hdlc_proto *proto,return -ENOBUFS ; }dev_to_hdlc (dev)->proto = proto; -dev_to_desc (dev)->netif_rx = rx;return 0 ; }
drivers/net/wan/hdlc_cisco.c +3 -2
@@ -250,7 +250,7 @@ static int cisco_rx(struct sk_buff *skb)return NET_RX_DROP ; rx_error: -dev_to_desc (dev)->stats.rx_errors++;/* Mark error */ +dev_to_hdlc (dev)->stats.rx_errors++;/* Mark error */ dev_kfree_skb_any (skb);return NET_RX_DROP ; }
@@ -314,6 +314,7 @@ static struct hdlc_proto proto = { .stop = cisco_stop, .type_trans = cisco_type_trans, .ioctl = cisco_ioctl, + .netif_rx = cisco_rx, .module = THIS_MODULE, };
@@ -360,7 +361,7 @@ static int cisco_ioctl(struct net_device *dev, struct ifreq *ifr)if (result)return result; - result =attach_hdlc_protocol (dev, &proto, cisco_rx, + result =attach_hdlc_protocol (dev, &proto,sizeof (struct cisco_state ));if (result)return result;
drivers/net/wan/hdlc_fr.c +4 -3
@@ -957,7 +957,7 @@ static int fr_rx(struct sk_buff *skb)if ((skb =skb_share_check (skb,GFP_ATOMIC )) ==NULL ) { -dev_to_desc (frad)->stats.rx_dropped++; +dev_to_hdlc (frad)->stats.rx_dropped++;return NET_RX_DROP ; }
@@ -1018,7 +1018,7 @@ static int fr_rx(struct sk_buff *skb) } rx_error: -dev_to_desc (frad)->stats.rx_errors++;/* Mark error */ +dev_to_hdlc (frad)->stats.rx_errors++;/* Mark error */ dev_kfree_skb_any (skb);return NET_RX_DROP ; }
@@ -1219,6 +1219,7 @@ static struct hdlc_proto proto = { .stop = fr_stop, .detach = fr_destroy, .ioctl = fr_ioctl, + .netif_rx = fr_rx, .module = THIS_MODULE, };
@@ -1277,7 +1278,7 @@ static int fr_ioctl(struct net_device *dev, struct ifreq *ifr)return result;if (dev_to_hdlc (dev)->proto != &proto) {/* Different proto */ - result =attach_hdlc_protocol (dev, &proto, fr_rx, + result =attach_hdlc_protocol (dev, &proto,sizeof (struct frad_state ));if (result)return result;
drivers/net/wan/hdlc_ppp.c +1 -1
@@ -122,7 +122,7 @@ static int ppp_ioctl(struct net_device *dev, struct ifreq *ifr)if (result)return result; - result =attach_hdlc_protocol (dev, &proto,NULL , + result =attach_hdlc_protocol (dev, &proto,sizeof (struct ppp_state ));if (result)return result;
drivers/net/wan/hdlc_raw.c +1 -1
@@ -82,7 +82,7 @@ static int raw_ioctl(struct net_device *dev, struct ifreq *ifr)if (result)return result; - result =attach_hdlc_protocol (dev, &proto,NULL , + result =attach_hdlc_protocol (dev, &proto,sizeof (raw_hdlc_proto));if (result)return result;
drivers/net/wan/hdlc_raw_eth.c +1 -1
@@ -96,7 +96,7 @@ static int raw_eth_ioctl(struct net_device *dev, struct ifreq *ifr)if (result)return result; - result =attach_hdlc_protocol (dev, &proto,NULL , + result =attach_hdlc_protocol (dev, &proto,sizeof (raw_hdlc_proto));if (result)return result;
drivers/net/wan/hdlc_x25.c +5 -5
@@ -164,17 +164,17 @@ static void x25_close(struct net_device *dev)static int x25_rx (struct sk_buff *skb) { -struct hdlc_device_desc *desc =dev_to_desc (skb->dev); +struct hdlc_device *hdlc =dev_to_hdlc (skb->dev);if ((skb =skb_share_check (skb,GFP_ATOMIC )) ==NULL ) { - desc->stats.rx_dropped++; + hdlc->stats.rx_dropped++;return NET_RX_DROP ; }if (lapb_data_received (skb->dev, skb) ==LAPB_OK )return NET_RX_SUCCESS ; - desc->stats.rx_errors++; + hdlc->stats.rx_errors++;dev_kfree_skb_any (skb);return NET_RX_DROP ; }
@@ -184,6 +184,7 @@ static struct hdlc_proto proto = { .open = x25_open, .close = x25_close, .ioctl = x25_ioctl, + .netif_rx = x25_rx, .module = THIS_MODULE, };
@@ -211,8 +212,7 @@ static int x25_ioctl(struct net_device *dev, struct ifreq *ifr)if (result)return result; -if ((result =attach_hdlc_protocol (dev, &proto, - x25_rx,0 )) !=0 ) +if ((result =attach_hdlc_protocol (dev, &proto,0 )))return result; dev->hard_start_xmit = x25_xmit; dev->type =ARPHRD_X25 ;
include/linux/hdlc.h +7 -18
@@ -26,13 +26,6 @@#include <linux/netdevice.h> #include <linux/hdlc/ioctl.h> - -/* Used by all network devices here, pointed to by netdev_priv(dev) */ -struct hdlc_device_desc { -int (*netif_rx)(struct sk_buff *skb); -struct net_device_stats stats; -}; -/* This structure is a private property of HDLC protocols. Hardware drivers have no interest here */
@@ -44,12 +37,15 @@ struct hdlc_proto {void (*detach)(struct net_device *dev);int (*ioctl)(struct net_device *dev,struct ifreq *ifr);__be16 (*type_trans)(struct sk_buff *skb,struct net_device *dev); +int (*netif_rx)(struct sk_buff *skb);struct module *module;struct hdlc_proto *next;/* next protocol in the list */ }; +/* Pointed to by dev->priv */ typedef struct hdlc_device { + struct net_device_stats stats; /* used by HDLC layer to take control over HDLC device from hw driver*/ int (*attach)(struct net_device *dev, unsigned short encoding, unsigned short parity);
@@ -83,18 +79,11 @@ void unregister_hdlc_protocol(struct hdlc_proto *proto);struct net_device *alloc_hdlcdev (void *priv); - -static __inline__struct hdlc_device_desc *dev_to_desc (struct net_device *dev) -{ -return netdev_priv (dev); -} - -static __inline__hdlc_device *dev_to_hdlc (struct net_device *dev) +static inline struct hdlc_device *dev_to_hdlc (struct net_device *dev) { -return netdev_priv (dev) +sizeof (struct hdlc_device_desc ); +return dev->priv; } -static __inline__void debug_frame (const struct sk_buff *skb) {int i;
@@ -116,13 +105,13 @@ int hdlc_open(struct net_device *dev);void hdlc_close (struct net_device *dev);int attach_hdlc_protocol (struct net_device *dev,struct hdlc_proto *proto, -int (*rx)(struct sk_buff *skb),size_t size); +size_t size);/* May be used by hardware driver to gain control over HDLC device */ void detach_hdlc_protocol (struct net_device *dev);static __inline__struct net_device_stats *hdlc_stats (struct net_device *dev) { -return &dev_to_desc (dev)->stats; +return &dev_to_hdlc (dev)->stats; }
Krzysztof Halasa
maintainerPATCH 3/3 Generic HDLC - use random_ether_addr()
In reply to Krzysztof HalasaGeneric HDLC now uses random_ether_addr() for generating MAC addresse for Ethernet-alike interfaces.
drivers/net/wan/hdlc_fr.c +3 -5
@@ -42,7 +42,6 @@#include <linux/init.h> #include <linux/skbuff.h> #include <linux/pkt_sched.h> -#include <linux/random.h> #include <linux/inetdevice.h> #include <linux/lapb.h> #include <linux/rtnetlink.h>
@@ -1122,10 +1121,9 @@ static int fr_add_pvc(struct net_device *frad, unsigned int dlci, int type)return -ENOBUFS ; } -if (type ==ARPHRD_ETHER ) { -memcpy (dev->dev_addr,"\x00\x01" ,2 ); -get_random_bytes (dev->dev_addr +2 ,ETH_ALEN -2 ); - }else { +if (type ==ARPHRD_ETHER ) +random_ether_addr (dev->dev_addr); +else { *(__be16 *)dev->dev_addr =htons (dlci);dlci_to_q922 (dev->broadcast, dlci); }
drivers/net/wan/hdlc_raw_eth.c +1 -3
@@ -18,7 +18,6 @@#include <linux/init.h> #include <linux/skbuff.h> #include <linux/pkt_sched.h> -#include <linux/random.h> #include <linux/inetdevice.h> #include <linux/lapb.h> #include <linux/rtnetlink.h>
@@ -107,8 +106,7 @@ static int raw_eth_ioctl(struct net_device *dev, struct ifreq *ifr)ether_setup (dev); dev->change_mtu = old_ch_mtu; dev->tx_queue_len = old_qlen; -memcpy (dev->dev_addr,"\x00\x01" ,2 ); -get_random_bytes (dev->dev_addr +2 ,ETH_ALEN -2 ); +random_ether_addr (dev->dev_addr);netif_dormant_off (dev);return 0 ; }