Skip to content

L
linux
Commit 8f3c812a authored by Alexander Viro's avatar Alexander Viro Committed by Stephen Hemminger
Browse files
Options

[wan hdlc] hdlc_cisco: killed ->netdev, hdlc_to_name() and hdlc_to_dev() uses.

parent de73d3b3
Hide whitespace changes
Inline Side-by-side
Showing with 25 additions and 24 deletions
drivers/net/wan/hdlc_cisco.c
View file @ 8f3c812a
...@@ -57,7 +57,7 @@ static int cisco_hard_header(struct sk_buff *skb, struct net_device *dev, ...@@ -57,7 +57,7 @@ static int cisco_hard_header(struct sk_buff *skb, struct net_device *dev,
static void cisco_keepalive_send(hdlc_device *hdlc, u32 type, static void cisco_keepalive_send(struct net_device *dev, u32 type,
u32 par1, u32 par2) u32 par1, u32 par2)
{ {
struct sk_buff *skb; struct sk_buff *skb;
...@@ -67,12 +67,11 @@ static void cisco_keepalive_send(hdlc_device *hdlc, u32 type, ...@@ -67,12 +67,11 @@ static void cisco_keepalive_send(hdlc_device *hdlc, u32 type,
if (!skb) { if (!skb) {
printk(KERN_WARNING printk(KERN_WARNING
"%s: Memory squeeze on cisco_keepalive_send()\n", "%s: Memory squeeze on cisco_keepalive_send()\n",
hdlc_to_name(hdlc)); dev->name);
return; return;
} }
skb_reserve(skb, 4); skb_reserve(skb, 4);
cisco_hard_header(skb, hdlc_to_dev(hdlc), CISCO_KEEPALIVE, cisco_hard_header(skb, dev, CISCO_KEEPALIVE, NULL, NULL, 0);
NULL, NULL, 0);
data = (cisco_packet*)skb->tail; data = (cisco_packet*)skb->tail;
data->type = htonl(type); data->type = htonl(type);
...@@ -84,7 +83,7 @@ static void cisco_keepalive_send(hdlc_device *hdlc, u32 type, ...@@ -84,7 +83,7 @@ static void cisco_keepalive_send(hdlc_device *hdlc, u32 type,
skb_put(skb, sizeof(cisco_packet)); skb_put(skb, sizeof(cisco_packet));
skb->priority = TC_PRIO_CONTROL; skb->priority = TC_PRIO_CONTROL;
skb->dev = hdlc_to_dev(hdlc); skb->dev = dev;
skb->nh.raw = skb->data; skb->nh.raw = skb->data;
dev_queue_xmit(skb); dev_queue_xmit(skb);
...@@ -118,7 +117,8 @@ static unsigned short cisco_type_trans(struct sk_buff *skb, ...@@ -118,7 +117,8 @@ static unsigned short cisco_type_trans(struct sk_buff *skb,
static int cisco_rx(struct sk_buff *skb) static int cisco_rx(struct sk_buff *skb)
{ {
hdlc_device *hdlc = dev_to_hdlc(skb->dev); struct net_device *dev = skb->dev;
hdlc_device *hdlc = dev_to_hdlc(dev);
hdlc_header *data = (hdlc_header*)skb->data; hdlc_header *data = (hdlc_header*)skb->data;
cisco_packet *cisco_data; cisco_packet *cisco_data;
struct in_device *in_dev; struct in_device *in_dev;
...@@ -142,7 +142,7 @@ static int cisco_rx(struct sk_buff *skb) ...@@ -142,7 +142,7 @@ static int cisco_rx(struct sk_buff *skb)
skb->len != sizeof(hdlc_header) + CISCO_BIG_PACKET_LEN) { skb->len != sizeof(hdlc_header) + CISCO_BIG_PACKET_LEN) {
printk(KERN_INFO "%s: Invalid length of Cisco " printk(KERN_INFO "%s: Invalid length of Cisco "
"control packet (%d bytes)\n", "control packet (%d bytes)\n",
hdlc_to_name(hdlc), skb->len); dev->name, skb->len);
goto rx_error; goto rx_error;
} }
...@@ -150,7 +150,7 @@ static int cisco_rx(struct sk_buff *skb) ...@@ -150,7 +150,7 @@ static int cisco_rx(struct sk_buff *skb)
switch(ntohl (cisco_data->type)) { switch(ntohl (cisco_data->type)) {
case CISCO_ADDR_REQ: /* Stolen from syncppp.c :-) */ case CISCO_ADDR_REQ: /* Stolen from syncppp.c :-) */
in_dev = hdlc_to_dev(hdlc)->ip_ptr; in_dev = dev->ip_ptr;
addr = 0; addr = 0;
mask = ~0; /* is the mask correct? */ mask = ~0; /* is the mask correct? */
...@@ -158,7 +158,7 @@ static int cisco_rx(struct sk_buff *skb) ...@@ -158,7 +158,7 @@ static int cisco_rx(struct sk_buff *skb)
struct in_ifaddr **ifap = &in_dev->ifa_list; struct in_ifaddr **ifap = &in_dev->ifa_list;
while (*ifap != NULL) { while (*ifap != NULL) {
if (strcmp(hdlc_to_name(hdlc), if (strcmp(dev->name,
(*ifap)->ifa_label) == 0) { (*ifap)->ifa_label) == 0) {
addr = (*ifap)->ifa_local; addr = (*ifap)->ifa_local;
mask = (*ifap)->ifa_mask; mask = (*ifap)->ifa_mask;
...@@ -167,7 +167,7 @@ static int cisco_rx(struct sk_buff *skb) ...@@ -167,7 +167,7 @@ static int cisco_rx(struct sk_buff *skb)
ifap = &(*ifap)->ifa_next; ifap = &(*ifap)->ifa_next;
} }
cisco_keepalive_send(hdlc, CISCO_ADDR_REPLY, cisco_keepalive_send(dev, CISCO_ADDR_REPLY,
addr, mask); addr, mask);
} }
dev_kfree_skb_any(skb); dev_kfree_skb_any(skb);
...@@ -175,7 +175,7 @@ static int cisco_rx(struct sk_buff *skb) ...@@ -175,7 +175,7 @@ static int cisco_rx(struct sk_buff *skb)
case CISCO_ADDR_REPLY: case CISCO_ADDR_REPLY:
printk(KERN_INFO "%s: Unexpected Cisco IP address " printk(KERN_INFO "%s: Unexpected Cisco IP address "
"reply\n", hdlc_to_name(hdlc)); "reply\n", dev->name);
goto rx_error; goto rx_error;
case CISCO_KEEPALIVE_REQ: case CISCO_KEEPALIVE_REQ:
...@@ -190,7 +190,7 @@ static int cisco_rx(struct sk_buff *skb) ...@@ -190,7 +190,7 @@ static int cisco_rx(struct sk_buff *skb)
days = hrs / 24; hrs -= days * 24; days = hrs / 24; hrs -= days * 24;
printk(KERN_INFO "%s: Link up (peer " printk(KERN_INFO "%s: Link up (peer "
"uptime %ud%uh%um%us)\n", "uptime %ud%uh%um%us)\n",
hdlc_to_name(hdlc), days, hrs, dev->name, days, hrs,
min, sec); min, sec);
} }
hdlc->state.cisco.up = 1; hdlc->state.cisco.up = 1;
...@@ -201,7 +201,7 @@ static int cisco_rx(struct sk_buff *skb) ...@@ -201,7 +201,7 @@ static int cisco_rx(struct sk_buff *skb)
} /* switch(keepalive type) */ } /* switch(keepalive type) */
} /* switch(protocol) */ } /* switch(protocol) */
printk(KERN_INFO "%s: Unsupported protocol %x\n", hdlc_to_name(hdlc), printk(KERN_INFO "%s: Unsupported protocol %x\n", dev->name,
data->protocol); data->protocol);
dev_kfree_skb_any(skb); dev_kfree_skb_any(skb);
return NET_RX_DROP; return NET_RX_DROP;
...@@ -216,17 +216,18 @@ static int cisco_rx(struct sk_buff *skb) ...@@ -216,17 +216,18 @@ static int cisco_rx(struct sk_buff *skb)
static void cisco_timer(unsigned long arg) static void cisco_timer(unsigned long arg)
{ {
hdlc_device *hdlc = (hdlc_device*)arg; struct net_device *dev = (struct net_device *)arg;
hdlc_device *hdlc = dev_to_hdlc(dev);
if (hdlc->state.cisco.up && jiffies - hdlc->state.cisco.last_poll >= if (hdlc->state.cisco.up && jiffies - hdlc->state.cisco.last_poll >=
hdlc->state.cisco.settings.timeout * HZ) { hdlc->state.cisco.settings.timeout * HZ) {
hdlc->state.cisco.up = 0; hdlc->state.cisco.up = 0;
printk(KERN_INFO "%s: Link down\n", hdlc_to_name(hdlc)); printk(KERN_INFO "%s: Link down\n", dev->name);
if (netif_carrier_ok(&hdlc->netdev)) if (netif_carrier_ok(dev))
netif_carrier_off(&hdlc->netdev); netif_carrier_off(dev);
} }
cisco_keepalive_send(hdlc, CISCO_KEEPALIVE_REQ, cisco_keepalive_send(dev, CISCO_KEEPALIVE_REQ,
++hdlc->state.cisco.txseq, ++hdlc->state.cisco.txseq,
hdlc->state.cisco.rxseq); hdlc->state.cisco.rxseq);
hdlc->state.cisco.timer.expires = jiffies + hdlc->state.cisco.timer.expires = jiffies +
...@@ -248,7 +249,7 @@ static void cisco_start(struct net_device *dev) ...@@ -248,7 +249,7 @@ static void cisco_start(struct net_device *dev)
init_timer(&hdlc->state.cisco.timer); init_timer(&hdlc->state.cisco.timer);
hdlc->state.cisco.timer.expires = jiffies + HZ; /*First poll after 1s*/ hdlc->state.cisco.timer.expires = jiffies + HZ; /*First poll after 1s*/
hdlc->state.cisco.timer.function = cisco_timer; hdlc->state.cisco.timer.function = cisco_timer;
hdlc->state.cisco.timer.data = (unsigned long)hdlc; hdlc->state.cisco.timer.data = (unsigned long)dev;
add_timer(&hdlc->state.cisco.timer); add_timer(&hdlc->state.cisco.timer);
} }
...@@ -263,12 +264,12 @@ static void cisco_stop(struct net_device *dev) ...@@ -263,12 +264,12 @@ static void cisco_stop(struct net_device *dev)
int hdlc_cisco_ioctl(hdlc_device *hdlc, struct ifreq *ifr) int hdlc_cisco_ioctl(struct net_device *dev, struct ifreq *ifr)
{ {
cisco_proto *cisco_s = ifr->ifr_settings.ifs_ifsu.cisco; cisco_proto *cisco_s = ifr->ifr_settings.ifs_ifsu.cisco;
const size_t size = sizeof(cisco_proto); const size_t size = sizeof(cisco_proto);
cisco_proto new_settings; cisco_proto new_settings;
struct net_device *dev = hdlc_to_dev(hdlc); hdlc_device *hdlc = dev_to_hdlc(dev);
int result; int result;
switch (ifr->ifr_settings.type) { switch (ifr->ifr_settings.type) {
......
drivers/net/wan/hdlc_generic.c
View file @ 8f3c812a
...@@ -181,7 +181,7 @@ void hdlc_close(struct net_device *dev) ...@@ -181,7 +181,7 @@ void hdlc_close(struct net_device *dev)
#endif #endif
#ifndef CONFIG_HDLC_CISCO #ifndef CONFIG_HDLC_CISCO
#define hdlc_cisco_ioctl(hdlc, ifr) -ENOSYS #define hdlc_cisco_ioctl(dev, ifr) -ENOSYS
#endif #endif
#ifndef CONFIG_HDLC_FR #ifndef CONFIG_HDLC_FR
...@@ -219,7 +219,7 @@ int hdlc_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) ...@@ -219,7 +219,7 @@ int hdlc_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
case IF_PROTO_HDLC: return hdlc_raw_ioctl(hdlc, ifr); case IF_PROTO_HDLC: return hdlc_raw_ioctl(hdlc, ifr);
case IF_PROTO_HDLC_ETH: return hdlc_raw_eth_ioctl(hdlc, ifr); case IF_PROTO_HDLC_ETH: return hdlc_raw_eth_ioctl(hdlc, ifr);
case IF_PROTO_PPP: return hdlc_ppp_ioctl(hdlc, ifr); case IF_PROTO_PPP: return hdlc_ppp_ioctl(hdlc, ifr);
case IF_PROTO_CISCO: return hdlc_cisco_ioctl(hdlc, ifr); case IF_PROTO_CISCO: return hdlc_cisco_ioctl(dev, ifr);
case IF_PROTO_FR: return hdlc_fr_ioctl(hdlc, ifr); case IF_PROTO_FR: return hdlc_fr_ioctl(hdlc, ifr);
case IF_PROTO_X25: return hdlc_x25_ioctl(hdlc, ifr); case IF_PROTO_X25: return hdlc_x25_ioctl(hdlc, ifr);
default: return -EINVAL; default: return -EINVAL;
......
include/linux/hdlc.h
View file @ 8f3c812a
...@@ -173,7 +173,7 @@ typedef struct hdlc_device_struct { ...@@ -173,7 +173,7 @@ typedef struct hdlc_device_struct {
int hdlc_raw_ioctl(hdlc_device *hdlc, struct ifreq *ifr); int hdlc_raw_ioctl(hdlc_device *hdlc, struct ifreq *ifr);
int hdlc_raw_eth_ioctl(hdlc_device *hdlc, struct ifreq *ifr); int hdlc_raw_eth_ioctl(hdlc_device *hdlc, struct ifreq *ifr);
int hdlc_cisco_ioctl(hdlc_device *hdlc, struct ifreq *ifr); int hdlc_cisco_ioctl(struct net_device *dev, struct ifreq *ifr);
int hdlc_ppp_ioctl(hdlc_device *hdlc, struct ifreq *ifr); int hdlc_ppp_ioctl(hdlc_device *hdlc, struct ifreq *ifr);
int hdlc_fr_ioctl(hdlc_device *hdlc, struct ifreq *ifr); int hdlc_fr_ioctl(hdlc_device *hdlc, struct ifreq *ifr);
int hdlc_x25_ioctl(hdlc_device *hdlc, struct ifreq *ifr); int hdlc_x25_ioctl(hdlc_device *hdlc, struct ifreq *ifr);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7