diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-09-01 18:02:01 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-09-01 18:02:01 -0400 |
| commit | e3ee3b78f83688a0ae4315e8be71b2eac559904a (patch) | |
| tree | deb03bcdd020262af450ed23382d7c921263f5cf /net/llc/llc_input.c | |
| parent | 91cb70c1769d9b72dd1efe40c31f01005820b09e (diff) | |
| parent | 6b39374a27eb4be7e9d82145ae270ba02ea90dc8 (diff) | |
/spare/repo/netdev-2.6 branch 'master'
Diffstat (limited to 'net/llc/llc_input.c')
| -rw-r--r-- | net/llc/llc_input.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/llc/llc_input.c b/net/llc/llc_input.c index 4da6976efc9c..13b46240b7a1 100644 --- a/net/llc/llc_input.c +++ b/net/llc/llc_input.c | |||
| @@ -132,7 +132,7 @@ static inline int llc_fixup_skb(struct sk_buff *skb) | |||
| 132 | * data now), it queues this frame in the connection's backlog. | 132 | * data now), it queues this frame in the connection's backlog. |
| 133 | */ | 133 | */ |
| 134 | int llc_rcv(struct sk_buff *skb, struct net_device *dev, | 134 | int llc_rcv(struct sk_buff *skb, struct net_device *dev, |
| 135 | struct packet_type *pt) | 135 | struct packet_type *pt, struct net_device *orig_dev) |
| 136 | { | 136 | { |
| 137 | struct llc_sap *sap; | 137 | struct llc_sap *sap; |
| 138 | struct llc_pdu_sn *pdu; | 138 | struct llc_pdu_sn *pdu; |
| @@ -165,7 +165,7 @@ int llc_rcv(struct sk_buff *skb, struct net_device *dev, | |||
| 165 | * LLC functionality | 165 | * LLC functionality |
| 166 | */ | 166 | */ |
| 167 | if (sap->rcv_func) { | 167 | if (sap->rcv_func) { |
| 168 | sap->rcv_func(skb, dev, pt); | 168 | sap->rcv_func(skb, dev, pt, orig_dev); |
| 169 | goto out; | 169 | goto out; |
| 170 | } | 170 | } |
| 171 | dest = llc_pdu_type(skb); | 171 | dest = llc_pdu_type(skb); |