diff options
author | David S. Miller <davem@davemloft.net> | 2008-03-18 03:37:55 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-03-18 03:37:55 -0400 |
commit | 577f99c1d08cf9cbdafd4e858dd13ff04d855090 (patch) | |
tree | 0f726bbda9b18d311d4c95198bbd96cb7ac01db0 /include/linux/in.h | |
parent | 26c0f03f6b77c513cb7bc37b73a06819bdbb791b (diff) | |
parent | 2f633928cbba8a5858bb39b11e7219a41b0fbef5 (diff) |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/wireless/rt2x00/rt2x00dev.c
net/8021q/vlan_dev.c
Diffstat (limited to 'include/linux/in.h')
-rw-r--r-- | include/linux/in.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/in.h b/include/linux/in.h index 70c6df882694..4065313cd7ee 100644 --- a/include/linux/in.h +++ b/include/linux/in.h | |||
@@ -265,7 +265,7 @@ static inline bool ipv4_is_local_multicast(__be32 addr) | |||
265 | static inline bool ipv4_is_lbcast(__be32 addr) | 265 | static inline bool ipv4_is_lbcast(__be32 addr) |
266 | { | 266 | { |
267 | /* limited broadcast */ | 267 | /* limited broadcast */ |
268 | return addr == INADDR_BROADCAST; | 268 | return addr == htonl(INADDR_BROADCAST); |
269 | } | 269 | } |
270 | 270 | ||
271 | static inline bool ipv4_is_zeronet(__be32 addr) | 271 | static inline bool ipv4_is_zeronet(__be32 addr) |