aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/isdn/i4l/isdn_net.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/isdn/i4l/isdn_net.c')
-rw-r--r--drivers/isdn/i4l/isdn_net.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/drivers/isdn/i4l/isdn_net.c b/drivers/isdn/i4l/isdn_net.c
index 26d44c3ca1d8..afeede7ee295 100644
--- a/drivers/isdn/i4l/isdn_net.c
+++ b/drivers/isdn/i4l/isdn_net.c
@@ -827,7 +827,7 @@ isdn_net_dial(void)
827void 827void
828isdn_net_hangup(struct net_device *d) 828isdn_net_hangup(struct net_device *d)
829{ 829{
830 isdn_net_local *lp = (isdn_net_local *) netdev_priv(d); 830 isdn_net_local *lp = netdev_priv(d);
831 isdn_ctrl cmd; 831 isdn_ctrl cmd;
832#ifdef CONFIG_ISDN_X25 832#ifdef CONFIG_ISDN_X25
833 struct concap_proto *cprot = lp->netdev->cprot; 833 struct concap_proto *cprot = lp->netdev->cprot;
@@ -1052,7 +1052,7 @@ isdn_net_xmit(struct net_device *ndev, struct sk_buff *skb)
1052{ 1052{
1053 isdn_net_dev *nd; 1053 isdn_net_dev *nd;
1054 isdn_net_local *slp; 1054 isdn_net_local *slp;
1055 isdn_net_local *lp = (isdn_net_local *) netdev_priv(ndev); 1055 isdn_net_local *lp = netdev_priv(ndev);
1056 int retv = NETDEV_TX_OK; 1056 int retv = NETDEV_TX_OK;
1057 1057
1058 if (((isdn_net_local *) netdev_priv(ndev))->master) { 1058 if (((isdn_net_local *) netdev_priv(ndev))->master) {
@@ -1116,7 +1116,7 @@ isdn_net_xmit(struct net_device *ndev, struct sk_buff *skb)
1116static void 1116static void
1117isdn_net_adjust_hdr(struct sk_buff *skb, struct net_device *dev) 1117isdn_net_adjust_hdr(struct sk_buff *skb, struct net_device *dev)
1118{ 1118{
1119 isdn_net_local *lp = (isdn_net_local *) netdev_priv(dev); 1119 isdn_net_local *lp = netdev_priv(dev);
1120 if (!skb) 1120 if (!skb)
1121 return; 1121 return;
1122 if (lp->p_encap == ISDN_NET_ENCAP_ETHER) { 1122 if (lp->p_encap == ISDN_NET_ENCAP_ETHER) {
@@ -1131,7 +1131,7 @@ isdn_net_adjust_hdr(struct sk_buff *skb, struct net_device *dev)
1131 1131
1132static void isdn_net_tx_timeout(struct net_device * ndev) 1132static void isdn_net_tx_timeout(struct net_device * ndev)
1133{ 1133{
1134 isdn_net_local *lp = (isdn_net_local *) netdev_priv(ndev); 1134 isdn_net_local *lp = netdev_priv(ndev);
1135 1135
1136 printk(KERN_WARNING "isdn_tx_timeout dev %s dialstate %d\n", ndev->name, lp->dialstate); 1136 printk(KERN_WARNING "isdn_tx_timeout dev %s dialstate %d\n", ndev->name, lp->dialstate);
1137 if (!lp->dialstate){ 1137 if (!lp->dialstate){
@@ -1165,7 +1165,7 @@ static void isdn_net_tx_timeout(struct net_device * ndev)
1165static netdev_tx_t 1165static netdev_tx_t
1166isdn_net_start_xmit(struct sk_buff *skb, struct net_device *ndev) 1166isdn_net_start_xmit(struct sk_buff *skb, struct net_device *ndev)
1167{ 1167{
1168 isdn_net_local *lp = (isdn_net_local *) netdev_priv(ndev); 1168 isdn_net_local *lp = netdev_priv(ndev);
1169#ifdef CONFIG_ISDN_X25 1169#ifdef CONFIG_ISDN_X25
1170 struct concap_proto * cprot = lp -> netdev -> cprot; 1170 struct concap_proto * cprot = lp -> netdev -> cprot;
1171/* At this point hard_start_xmit() passes control to the encapsulation 1171/* At this point hard_start_xmit() passes control to the encapsulation
@@ -1347,7 +1347,7 @@ isdn_net_close(struct net_device *dev)
1347static struct net_device_stats * 1347static struct net_device_stats *
1348isdn_net_get_stats(struct net_device *dev) 1348isdn_net_get_stats(struct net_device *dev)
1349{ 1349{
1350 isdn_net_local *lp = (isdn_net_local *) netdev_priv(dev); 1350 isdn_net_local *lp = netdev_priv(dev);
1351 return &lp->stats; 1351 return &lp->stats;
1352} 1352}
1353 1353
@@ -1426,7 +1426,7 @@ isdn_net_ciscohdlck_alloc_skb(isdn_net_local *lp, int len)
1426static int 1426static int
1427isdn_ciscohdlck_dev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) 1427isdn_ciscohdlck_dev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
1428{ 1428{
1429 isdn_net_local *lp = (isdn_net_local *) netdev_priv(dev); 1429 isdn_net_local *lp = netdev_priv(dev);
1430 unsigned long len = 0; 1430 unsigned long len = 0;
1431 unsigned long expires = 0; 1431 unsigned long expires = 0;
1432 int tmp = 0; 1432 int tmp = 0;
@@ -1493,7 +1493,7 @@ isdn_ciscohdlck_dev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
1493static int isdn_net_ioctl(struct net_device *dev, 1493static int isdn_net_ioctl(struct net_device *dev,
1494 struct ifreq *ifr, int cmd) 1494 struct ifreq *ifr, int cmd)
1495{ 1495{
1496 isdn_net_local *lp = (isdn_net_local *) netdev_priv(dev); 1496 isdn_net_local *lp = netdev_priv(dev);
1497 1497
1498 switch (lp->p_encap) { 1498 switch (lp->p_encap) {
1499#ifdef CONFIG_ISDN_PPP 1499#ifdef CONFIG_ISDN_PPP
@@ -1786,7 +1786,7 @@ isdn_net_ciscohdlck_receive(isdn_net_local *lp, struct sk_buff *skb)
1786static void 1786static void
1787isdn_net_receive(struct net_device *ndev, struct sk_buff *skb) 1787isdn_net_receive(struct net_device *ndev, struct sk_buff *skb)
1788{ 1788{
1789 isdn_net_local *lp = (isdn_net_local *) netdev_priv(ndev); 1789 isdn_net_local *lp = netdev_priv(ndev);
1790 isdn_net_local *olp = lp; /* original 'lp' */ 1790 isdn_net_local *olp = lp; /* original 'lp' */
1791#ifdef CONFIG_ISDN_X25 1791#ifdef CONFIG_ISDN_X25
1792 struct concap_proto *cprot = lp -> netdev -> cprot; 1792 struct concap_proto *cprot = lp -> netdev -> cprot;
@@ -1800,7 +1800,7 @@ isdn_net_receive(struct net_device *ndev, struct sk_buff *skb)
1800 * handle master's statistics and hangup-timeout 1800 * handle master's statistics and hangup-timeout
1801 */ 1801 */
1802 ndev = lp->master; 1802 ndev = lp->master;
1803 lp = (isdn_net_local *) netdev_priv(ndev); 1803 lp = netdev_priv(ndev);
1804 lp->stats.rx_packets++; 1804 lp->stats.rx_packets++;
1805 lp->stats.rx_bytes += skb->len; 1805 lp->stats.rx_bytes += skb->len;
1806 } 1806 }