projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/aoe-2.6
[cascardo/linux.git]
/
include
/
linux
/
if_shaper.h
diff --git
a/include/linux/if_shaper.h
b/include/linux/if_shaper.h
index
004e6f0
..
68c896a
100644
(file)
--- a/
include/linux/if_shaper.h
+++ b/
include/linux/if_shaper.h
@@
-23,7
+23,7
@@
struct shaper
__u32 shapeclock;
unsigned long recovery; /* Time we can next clock a packet out on
an empty queue */
- s
truct semaphore sem
;
+ s
pinlock_t lock
;
struct net_device_stats stats;
struct net_device *dev;
int (*hard_start_xmit) (struct sk_buff *skb,