OSDN Git Service
(root)
/
android-x86
/
kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into...
[android-x86/kernel.git]
/
net
/
bridge
/
br_input.c
diff --git
a/net/bridge/br_input.c
b/net/bridge/br_input.c
index
0c7bada
..
f3ac1e8
100644
(file)
--- a/
net/bridge/br_input.c
+++ b/
net/bridge/br_input.c
@@
-98,9
+98,10
@@
int br_handle_frame_finish(struct sk_buff *skb)
}
if (skb) {
- if (dst)
+ if (dst) {
+ dst->used = jiffies;
br_forward(dst->dst, skb, skb2);
- else
+
}
else
br_flood_forward(br, skb, skb2);
}