diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-08-29 20:36:46 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-08-29 20:36:46 -0400 |
| commit | 826509f8110049663799bc20f2b5b6170e2f78ca (patch) | |
| tree | 9d8823cf283592625b882125b4b13988f2934cc6 /net/x25/x25_dev.c | |
| parent | d992895ba2b27cf5adf1ba0ad6d27662adc54c5e (diff) | |
| parent | c530cfb1ce1e8f230744c3f3bd86771f50725053 (diff) | |
Merge HEAD from master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6.git
Diffstat (limited to 'net/x25/x25_dev.c')
| -rw-r--r-- | net/x25/x25_dev.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/x25/x25_dev.c b/net/x25/x25_dev.c index 36fc3bf6d882..adfe7b8df355 100644 --- a/net/x25/x25_dev.c +++ b/net/x25/x25_dev.c | |||
| @@ -81,7 +81,7 @@ static int x25_receive_data(struct sk_buff *skb, struct x25_neigh *nb) | |||
| 81 | } | 81 | } |
| 82 | 82 | ||
| 83 | int x25_lapb_receive_frame(struct sk_buff *skb, struct net_device *dev, | 83 | int x25_lapb_receive_frame(struct sk_buff *skb, struct net_device *dev, |
| 84 | struct packet_type *ptype) | 84 | struct packet_type *ptype, struct net_device *orig_dev) |
| 85 | { | 85 | { |
| 86 | struct sk_buff *nskb; | 86 | struct sk_buff *nskb; |
| 87 | struct x25_neigh *nb; | 87 | struct x25_neigh *nb; |