projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] Terminate process that fails on a constrained allocation
[powerpc.git]
/
net
/
appletalk
/
aarp.c
diff --git
a/net/appletalk/aarp.c
b/net/appletalk/aarp.c
index
c34614e
..
7076097
100644
(file)
--- a/
net/appletalk/aarp.c
+++ b/
net/appletalk/aarp.c
@@
-698,7
+698,7
@@
static void __aarp_resolved(struct aarp_entry **list, struct aarp_entry *a,
* frame. We currently only support Ethernet.
*/
static int aarp_rcv(struct sk_buff *skb, struct net_device *dev,
* frame. We currently only support Ethernet.
*/
static int aarp_rcv(struct sk_buff *skb, struct net_device *dev,
- struct packet_type *pt)
+ struct packet_type *pt
, struct net_device *orig_dev
)
{
struct elapaarp *ea = aarp_hdr(skb);
int hash, ret = 0;
{
struct elapaarp *ea = aarp_hdr(skb);
int hash, ret = 0;