Commit 00804aa7 authored by Kai Germaschewski's avatar Kai Germaschewski

ISDN: separate out IPTYP receive function

Another step in splitting isdn_net_receive into type specific functions.
parent 7a242819
...@@ -211,6 +211,7 @@ static int isdn_uihdlc_setup(isdn_net_dev *p); ...@@ -211,6 +211,7 @@ static int isdn_uihdlc_setup(isdn_net_dev *p);
static int isdn_iptyp_setup(isdn_net_dev *p); static int isdn_iptyp_setup(isdn_net_dev *p);
static void isdn_ether_receive(isdn_net_dev *p, isdn_net_local *olp, struct sk_buff *skb); static void isdn_ether_receive(isdn_net_dev *p, isdn_net_local *olp, struct sk_buff *skb);
static void isdn_uihdlc_receive(isdn_net_dev *p, isdn_net_local *olp, struct sk_buff *skb);
char *isdn_net_revision = "$Revision: 1.140.6.11 $"; char *isdn_net_revision = "$Revision: 1.140.6.11 $";
...@@ -1230,11 +1231,8 @@ isdn_net_receive(struct net_device *ndev, struct sk_buff *skb) ...@@ -1230,11 +1231,8 @@ isdn_net_receive(struct net_device *ndev, struct sk_buff *skb)
isdn_ether_receive(lp->netdev, olp, skb); isdn_ether_receive(lp->netdev, olp, skb);
return; return;
case ISDN_NET_ENCAP_UIHDLC: case ISDN_NET_ENCAP_UIHDLC:
/* HDLC with UI-frame (for ispa with -h1 option) */ isdn_uihdlc_receive(lp->netdev, olp, skb);
olp->huptimer = 0; return;
lp->huptimer = 0;
skb_pull(skb, 2);
/* Fall through */
case ISDN_NET_ENCAP_RAWIP: case ISDN_NET_ENCAP_RAWIP:
/* RAW-IP without MAC-Header */ /* RAW-IP without MAC-Header */
olp->huptimer = 0; olp->huptimer = 0;
...@@ -2542,6 +2540,17 @@ isdn_uihdlc_header(struct sk_buff *skb, struct net_device *dev, ...@@ -2542,6 +2540,17 @@ isdn_uihdlc_header(struct sk_buff *skb, struct net_device *dev,
return 2; return 2;
} }
static void
isdn_uihdlc_receive(isdn_net_dev *p, isdn_net_local *olp,
struct sk_buff *skb)
{
isdn_net_local *lp = &p->local;
isdn_net_reset_huptimer(lp, olp);
skb_pull(skb, 2);
netif_rx(skb);
}
int int
isdn_uihdlc_setup(isdn_net_dev *p) isdn_uihdlc_setup(isdn_net_dev *p)
{ {
......
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