diff options
| author | Patrick McHardy <kaber@trash.net> | 2010-06-15 11:31:06 -0400 |
|---|---|---|
| committer | Patrick McHardy <kaber@trash.net> | 2010-06-15 11:31:06 -0400 |
| commit | f9181f4ffc71d7b7dd1906c9a11d51d6659220ae (patch) | |
| tree | 194f22e8216a1b9ee2c0dd019142202d73a7dc87 /include/linux/mISDNif.h | |
| parent | 0902b469bd25065aa0688c3cee6f11744c817e7c (diff) | |
| parent | 1ab6c163dee279559e3a62d774af7e4c4c9b4c67 (diff) | |
Merge branch 'master' of /repos/git/net-next-2.6
Conflicts:
include/net/netfilter/xt_rateest.h
net/bridge/br_netfilter.c
net/netfilter/nf_conntrack_core.c
Signed-off-by: Patrick McHardy <kaber@trash.net>
Diffstat (limited to 'include/linux/mISDNif.h')
| -rw-r--r-- | include/linux/mISDNif.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/mISDNif.h b/include/linux/mISDNif.h index 78c3bed1c3f5..b5e7f2202484 100644 --- a/include/linux/mISDNif.h +++ b/include/linux/mISDNif.h | |||
| @@ -251,7 +251,7 @@ | |||
| 251 | struct mISDNhead { | 251 | struct mISDNhead { |
| 252 | unsigned int prim; | 252 | unsigned int prim; |
| 253 | unsigned int id; | 253 | unsigned int id; |
| 254 | } __attribute__((packed)); | 254 | } __packed; |
| 255 | 255 | ||
| 256 | #define MISDN_HEADER_LEN sizeof(struct mISDNhead) | 256 | #define MISDN_HEADER_LEN sizeof(struct mISDNhead) |
| 257 | #define MAX_DATA_SIZE 2048 | 257 | #define MAX_DATA_SIZE 2048 |