diff options
Diffstat (limited to 'drivers/isdn')
-rw-r--r-- | drivers/isdn/i4l/isdn_ppp.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/drivers/isdn/i4l/isdn_ppp.c b/drivers/isdn/i4l/isdn_ppp.c index 97c5cc2997f5..9e8162c80bb0 100644 --- a/drivers/isdn/i4l/isdn_ppp.c +++ b/drivers/isdn/i4l/isdn_ppp.c | |||
@@ -1147,15 +1147,14 @@ isdn_ppp_push_higher(isdn_net_dev * net_dev, isdn_net_local * lp, struct sk_buff | |||
1147 | } | 1147 | } |
1148 | 1148 | ||
1149 | if (is->pass_filter | 1149 | if (is->pass_filter |
1150 | && sk_run_filter(skb, is->pass_filter, is->pass_len) == 0) { | 1150 | && sk_run_filter(skb, is->pass_filter) == 0) { |
1151 | if (is->debug & 0x2) | 1151 | if (is->debug & 0x2) |
1152 | printk(KERN_DEBUG "IPPP: inbound frame filtered.\n"); | 1152 | printk(KERN_DEBUG "IPPP: inbound frame filtered.\n"); |
1153 | kfree_skb(skb); | 1153 | kfree_skb(skb); |
1154 | return; | 1154 | return; |
1155 | } | 1155 | } |
1156 | if (!(is->active_filter | 1156 | if (!(is->active_filter |
1157 | && sk_run_filter(skb, is->active_filter, | 1157 | && sk_run_filter(skb, is->active_filter) == 0)) { |
1158 | is->active_len) == 0)) { | ||
1159 | if (is->debug & 0x2) | 1158 | if (is->debug & 0x2) |
1160 | printk(KERN_DEBUG "IPPP: link-active filter: reseting huptimer.\n"); | 1159 | printk(KERN_DEBUG "IPPP: link-active filter: reseting huptimer.\n"); |
1161 | lp->huptimer = 0; | 1160 | lp->huptimer = 0; |
@@ -1294,15 +1293,14 @@ isdn_ppp_xmit(struct sk_buff *skb, struct net_device *netdev) | |||
1294 | } | 1293 | } |
1295 | 1294 | ||
1296 | if (ipt->pass_filter | 1295 | if (ipt->pass_filter |
1297 | && sk_run_filter(skb, ipt->pass_filter, ipt->pass_len) == 0) { | 1296 | && sk_run_filter(skb, ipt->pass_filter) == 0) { |
1298 | if (ipt->debug & 0x4) | 1297 | if (ipt->debug & 0x4) |
1299 | printk(KERN_DEBUG "IPPP: outbound frame filtered.\n"); | 1298 | printk(KERN_DEBUG "IPPP: outbound frame filtered.\n"); |
1300 | kfree_skb(skb); | 1299 | kfree_skb(skb); |
1301 | goto unlock; | 1300 | goto unlock; |
1302 | } | 1301 | } |
1303 | if (!(ipt->active_filter | 1302 | if (!(ipt->active_filter |
1304 | && sk_run_filter(skb, ipt->active_filter, | 1303 | && sk_run_filter(skb, ipt->active_filter) == 0)) { |
1305 | ipt->active_len) == 0)) { | ||
1306 | if (ipt->debug & 0x4) | 1304 | if (ipt->debug & 0x4) |
1307 | printk(KERN_DEBUG "IPPP: link-active filter: reseting huptimer.\n"); | 1305 | printk(KERN_DEBUG "IPPP: link-active filter: reseting huptimer.\n"); |
1308 | lp->huptimer = 0; | 1306 | lp->huptimer = 0; |
@@ -1492,9 +1490,9 @@ int isdn_ppp_autodial_filter(struct sk_buff *skb, isdn_net_local *lp) | |||
1492 | } | 1490 | } |
1493 | 1491 | ||
1494 | drop |= is->pass_filter | 1492 | drop |= is->pass_filter |
1495 | && sk_run_filter(skb, is->pass_filter, is->pass_len) == 0; | 1493 | && sk_run_filter(skb, is->pass_filter) == 0; |
1496 | drop |= is->active_filter | 1494 | drop |= is->active_filter |
1497 | && sk_run_filter(skb, is->active_filter, is->active_len) == 0; | 1495 | && sk_run_filter(skb, is->active_filter) == 0; |
1498 | 1496 | ||
1499 | skb_push(skb, IPPP_MAX_HEADER - 4); | 1497 | skb_push(skb, IPPP_MAX_HEADER - 4); |
1500 | return drop; | 1498 | return drop; |