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 /drivers/block | |
| 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 'drivers/block')
| -rw-r--r-- | drivers/block/aoe/aoenet.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/block/aoe/aoenet.c b/drivers/block/aoe/aoenet.c index 9e6f51c528b0..4be976940f69 100644 --- a/drivers/block/aoe/aoenet.c +++ b/drivers/block/aoe/aoenet.c | |||
| @@ -120,7 +120,7 @@ aoenet_xmit(struct sk_buff *sl) | |||
| 120 | * (1) len doesn't include the header by default. I want this. | 120 | * (1) len doesn't include the header by default. I want this. |
| 121 | */ | 121 | */ |
| 122 | static int | 122 | static int |
| 123 | aoenet_rcv(struct sk_buff *skb, struct net_device *ifp, struct packet_type *pt) | 123 | aoenet_rcv(struct sk_buff *skb, struct net_device *ifp, struct packet_type *pt, struct net_device *orig_dev) |
| 124 | { | 124 | { |
| 125 | struct aoe_hdr *h; | 125 | struct aoe_hdr *h; |
| 126 | u32 n; | 126 | u32 n; |