Skip to content

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

[wan hdlc_x25] eliminated hdlc_to_dev() and hdlc_to_name() uses.

parent aa7815ef
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 8 deletions
drivers/net/wan/hdlc_generic.c
View file @ f31b6d76
...@@ -189,7 +189,7 @@ void hdlc_close(struct net_device *dev) ...@@ -189,7 +189,7 @@ void hdlc_close(struct net_device *dev)
#endif #endif
#ifndef CONFIG_HDLC_X25 #ifndef CONFIG_HDLC_X25
#define hdlc_x25_ioctl(hdlc, ifr) -ENOSYS #define hdlc_x25_ioctl(dev, ifr) -ENOSYS
#endif #endif
...@@ -221,7 +221,7 @@ int hdlc_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) ...@@ -221,7 +221,7 @@ int hdlc_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
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(dev, ifr); case IF_PROTO_CISCO: return hdlc_cisco_ioctl(dev, ifr);
case IF_PROTO_FR: return hdlc_fr_ioctl(dev, ifr); case IF_PROTO_FR: return hdlc_fr_ioctl(dev, ifr);
case IF_PROTO_X25: return hdlc_x25_ioctl(hdlc, ifr); case IF_PROTO_X25: return hdlc_x25_ioctl(dev, ifr);
default: return -EINVAL; default: return -EINVAL;
} }
} }
......
drivers/net/wan/hdlc_x25.c
View file @ f31b6d76
...@@ -94,7 +94,6 @@ static void x25_data_transmit(struct net_device *dev, struct sk_buff *skb) ...@@ -94,7 +94,6 @@ static void x25_data_transmit(struct net_device *dev, struct sk_buff *skb)
static int x25_xmit(struct sk_buff *skb, struct net_device *dev) static int x25_xmit(struct sk_buff *skb, struct net_device *dev)
{ {
hdlc_device *hdlc = dev_to_hdlc(dev);
int result; int result;
...@@ -114,7 +113,7 @@ static int x25_xmit(struct sk_buff *skb, struct net_device *dev) ...@@ -114,7 +113,7 @@ static int x25_xmit(struct sk_buff *skb, struct net_device *dev)
else else
printk(KERN_ERR "%s: LAPB connect request " printk(KERN_ERR "%s: LAPB connect request "
"failed, error code = %i\n", "failed, error code = %i\n",
hdlc_to_name(hdlc), result); dev->name, result);
} }
break; break;
...@@ -126,7 +125,7 @@ static int x25_xmit(struct sk_buff *skb, struct net_device *dev) ...@@ -126,7 +125,7 @@ static int x25_xmit(struct sk_buff *skb, struct net_device *dev)
else else
printk(KERN_ERR "%s: LAPB disconnect request " printk(KERN_ERR "%s: LAPB disconnect request "
"failed, error code = %i\n", "failed, error code = %i\n",
hdlc_to_name(hdlc), result); dev->name, result);
} }
break; break;
...@@ -186,9 +185,9 @@ static int x25_rx(struct sk_buff *skb) ...@@ -186,9 +185,9 @@ static int x25_rx(struct sk_buff *skb)
int hdlc_x25_ioctl(hdlc_device *hdlc, struct ifreq *ifr) int hdlc_x25_ioctl(struct net_device *dev, struct ifreq *ifr)
{ {
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) {
......
include/linux/hdlc.h
View file @ f31b6d76
...@@ -176,7 +176,7 @@ int hdlc_raw_eth_ioctl(hdlc_device *hdlc, struct ifreq *ifr); ...@@ -176,7 +176,7 @@ int hdlc_raw_eth_ioctl(hdlc_device *hdlc, struct ifreq *ifr);
int hdlc_cisco_ioctl(struct net_device *dev, 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(struct net_device *dev, struct ifreq *ifr); int hdlc_fr_ioctl(struct net_device *dev, struct ifreq *ifr);
int hdlc_x25_ioctl(hdlc_device *hdlc, struct ifreq *ifr); int hdlc_x25_ioctl(struct net_device *dev, struct ifreq *ifr);
/* Exported from hdlc.o */ /* Exported from hdlc.o */
......
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