diff options
Diffstat (limited to 'drivers/net/ppp_generic.c')
| -rw-r--r-- | drivers/net/ppp_generic.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/drivers/net/ppp_generic.c b/drivers/net/ppp_generic.c index 89294b43c4a..6456484c029 100644 --- a/drivers/net/ppp_generic.c +++ b/drivers/net/ppp_generic.c | |||
| @@ -1136,8 +1136,7 @@ ppp_send_frame(struct ppp *ppp, struct sk_buff *skb) | |||
| 1136 | a four-byte PPP header on each packet */ | 1136 | a four-byte PPP header on each packet */ |
| 1137 | *skb_push(skb, 2) = 1; | 1137 | *skb_push(skb, 2) = 1; |
| 1138 | if (ppp->pass_filter && | 1138 | if (ppp->pass_filter && |
| 1139 | sk_run_filter(skb, ppp->pass_filter, | 1139 | sk_run_filter(skb, ppp->pass_filter) == 0) { |
| 1140 | ppp->pass_len) == 0) { | ||
| 1141 | if (ppp->debug & 1) | 1140 | if (ppp->debug & 1) |
| 1142 | printk(KERN_DEBUG "PPP: outbound frame not passed\n"); | 1141 | printk(KERN_DEBUG "PPP: outbound frame not passed\n"); |
| 1143 | kfree_skb(skb); | 1142 | kfree_skb(skb); |
| @@ -1145,8 +1144,7 @@ ppp_send_frame(struct ppp *ppp, struct sk_buff *skb) | |||
| 1145 | } | 1144 | } |
| 1146 | /* if this packet passes the active filter, record the time */ | 1145 | /* if this packet passes the active filter, record the time */ |
| 1147 | if (!(ppp->active_filter && | 1146 | if (!(ppp->active_filter && |
| 1148 | sk_run_filter(skb, ppp->active_filter, | 1147 | sk_run_filter(skb, ppp->active_filter) == 0)) |
| 1149 | ppp->active_len) == 0)) | ||
| 1150 | ppp->last_xmit = jiffies; | 1148 | ppp->last_xmit = jiffies; |
| 1151 | skb_pull(skb, 2); | 1149 | skb_pull(skb, 2); |
| 1152 | #else | 1150 | #else |
| @@ -1763,8 +1761,7 @@ ppp_receive_nonmp_frame(struct ppp *ppp, struct sk_buff *skb) | |||
| 1763 | 1761 | ||
| 1764 | *skb_push(skb, 2) = 0; | 1762 | *skb_push(skb, 2) = 0; |
| 1765 | if (ppp->pass_filter && | 1763 | if (ppp->pass_filter && |
| 1766 | sk_run_filter(skb, ppp->pass_filter, | 1764 | sk_run_filter(skb, ppp->pass_filter) == 0) { |
| 1767 | ppp->pass_len) == 0) { | ||
| 1768 | if (ppp->debug & 1) | 1765 | if (ppp->debug & 1) |
| 1769 | printk(KERN_DEBUG "PPP: inbound frame " | 1766 | printk(KERN_DEBUG "PPP: inbound frame " |
| 1770 | "not passed\n"); | 1767 | "not passed\n"); |
| @@ -1772,8 +1769,7 @@ ppp_receive_nonmp_frame(struct ppp *ppp, struct sk_buff *skb) | |||
| 1772 | return; | 1769 | return; |
| 1773 | } | 1770 | } |
| 1774 | if (!(ppp->active_filter && | 1771 | if (!(ppp->active_filter && |
| 1775 | sk_run_filter(skb, ppp->active_filter, | 1772 | sk_run_filter(skb, ppp->active_filter) == 0)) |
| 1776 | ppp->active_len) == 0)) | ||
| 1777 | ppp->last_recv = jiffies; | 1773 | ppp->last_recv = jiffies; |
| 1778 | __skb_pull(skb, 2); | 1774 | __skb_pull(skb, 2); |
| 1779 | } else | 1775 | } else |