summaryrefslogtreecommitdiffstats
path: root/include/linux/if_shaper.h
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>1999-06-13 16:29:25 +0000
committerRalf Baechle <ralf@linux-mips.org>1999-06-13 16:29:25 +0000
commitdb7d4daea91e105e3859cf461d7e53b9b77454b2 (patch)
tree9bb65b95440af09e8aca63abe56970dd3360cc57 /include/linux/if_shaper.h
parent9c1c01ead627bdda9211c9abd5b758d6c687d8ac (diff)
Merge with Linux 2.2.8.
Diffstat (limited to 'include/linux/if_shaper.h')
-rw-r--r--include/linux/if_shaper.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/if_shaper.h b/include/linux/if_shaper.h
index 57ffd730a..8a3cbce1b 100644
--- a/include/linux/if_shaper.h
+++ b/include/linux/if_shaper.h
@@ -23,7 +23,7 @@ struct shaper
__u32 shapeclock;
__u32 recovery; /* Time we can next clock a packet out on
an empty queue */
- char locked;
+ unsigned long locked;
struct device *dev;
int (*hard_start_xmit) (struct sk_buff *skb,
struct device *dev);