|
@@ -827,7 +827,7 @@ isdn_net_dial(void)
|
|
|
void
|
|
|
isdn_net_hangup(struct net_device *d)
|
|
|
{
|
|
|
- isdn_net_local *lp = (isdn_net_local *) netdev_priv(d);
|
|
|
+ isdn_net_local *lp = netdev_priv(d);
|
|
|
isdn_ctrl cmd;
|
|
|
#ifdef CONFIG_ISDN_X25
|
|
|
struct concap_proto *cprot = lp->netdev->cprot;
|
|
@@ -1052,7 +1052,7 @@ isdn_net_xmit(struct net_device *ndev, struct sk_buff *skb)
|
|
|
{
|
|
|
isdn_net_dev *nd;
|
|
|
isdn_net_local *slp;
|
|
|
- isdn_net_local *lp = (isdn_net_local *) netdev_priv(ndev);
|
|
|
+ isdn_net_local *lp = netdev_priv(ndev);
|
|
|
int retv = NETDEV_TX_OK;
|
|
|
|
|
|
if (((isdn_net_local *) netdev_priv(ndev))->master) {
|
|
@@ -1116,7 +1116,7 @@ isdn_net_xmit(struct net_device *ndev, struct sk_buff *skb)
|
|
|
static void
|
|
|
isdn_net_adjust_hdr(struct sk_buff *skb, struct net_device *dev)
|
|
|
{
|
|
|
- isdn_net_local *lp = (isdn_net_local *) netdev_priv(dev);
|
|
|
+ isdn_net_local *lp = netdev_priv(dev);
|
|
|
if (!skb)
|
|
|
return;
|
|
|
if (lp->p_encap == ISDN_NET_ENCAP_ETHER) {
|
|
@@ -1131,7 +1131,7 @@ isdn_net_adjust_hdr(struct sk_buff *skb, struct net_device *dev)
|
|
|
|
|
|
static void isdn_net_tx_timeout(struct net_device * ndev)
|
|
|
{
|
|
|
- isdn_net_local *lp = (isdn_net_local *) netdev_priv(ndev);
|
|
|
+ isdn_net_local *lp = netdev_priv(ndev);
|
|
|
|
|
|
printk(KERN_WARNING "isdn_tx_timeout dev %s dialstate %d\n", ndev->name, lp->dialstate);
|
|
|
if (!lp->dialstate){
|
|
@@ -1165,7 +1165,7 @@ static void isdn_net_tx_timeout(struct net_device * ndev)
|
|
|
static netdev_tx_t
|
|
|
isdn_net_start_xmit(struct sk_buff *skb, struct net_device *ndev)
|
|
|
{
|
|
|
- isdn_net_local *lp = (isdn_net_local *) netdev_priv(ndev);
|
|
|
+ isdn_net_local *lp = netdev_priv(ndev);
|
|
|
#ifdef CONFIG_ISDN_X25
|
|
|
struct concap_proto * cprot = lp -> netdev -> cprot;
|
|
|
/* At this point hard_start_xmit() passes control to the encapsulation
|
|
@@ -1347,7 +1347,7 @@ isdn_net_close(struct net_device *dev)
|
|
|
static struct net_device_stats *
|
|
|
isdn_net_get_stats(struct net_device *dev)
|
|
|
{
|
|
|
- isdn_net_local *lp = (isdn_net_local *) netdev_priv(dev);
|
|
|
+ isdn_net_local *lp = netdev_priv(dev);
|
|
|
return &lp->stats;
|
|
|
}
|
|
|
|
|
@@ -1426,7 +1426,7 @@ isdn_net_ciscohdlck_alloc_skb(isdn_net_local *lp, int len)
|
|
|
static int
|
|
|
isdn_ciscohdlck_dev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
|
|
|
{
|
|
|
- isdn_net_local *lp = (isdn_net_local *) netdev_priv(dev);
|
|
|
+ isdn_net_local *lp = netdev_priv(dev);
|
|
|
unsigned long len = 0;
|
|
|
unsigned long expires = 0;
|
|
|
int tmp = 0;
|
|
@@ -1493,7 +1493,7 @@ isdn_ciscohdlck_dev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
|
|
|
static int isdn_net_ioctl(struct net_device *dev,
|
|
|
struct ifreq *ifr, int cmd)
|
|
|
{
|
|
|
- isdn_net_local *lp = (isdn_net_local *) netdev_priv(dev);
|
|
|
+ isdn_net_local *lp = netdev_priv(dev);
|
|
|
|
|
|
switch (lp->p_encap) {
|
|
|
#ifdef CONFIG_ISDN_PPP
|
|
@@ -1786,7 +1786,7 @@ isdn_net_ciscohdlck_receive(isdn_net_local *lp, struct sk_buff *skb)
|
|
|
static void
|
|
|
isdn_net_receive(struct net_device *ndev, struct sk_buff *skb)
|
|
|
{
|
|
|
- isdn_net_local *lp = (isdn_net_local *) netdev_priv(ndev);
|
|
|
+ isdn_net_local *lp = netdev_priv(ndev);
|
|
|
isdn_net_local *olp = lp; /* original 'lp' */
|
|
|
#ifdef CONFIG_ISDN_X25
|
|
|
struct concap_proto *cprot = lp -> netdev -> cprot;
|
|
@@ -1800,7 +1800,7 @@ isdn_net_receive(struct net_device *ndev, struct sk_buff *skb)
|
|
|
* handle master's statistics and hangup-timeout
|
|
|
*/
|
|
|
ndev = lp->master;
|
|
|
- lp = (isdn_net_local *) netdev_priv(ndev);
|
|
|
+ lp = netdev_priv(ndev);
|
|
|
lp->stats.rx_packets++;
|
|
|
lp->stats.rx_bytes += skb->len;
|
|
|
}
|