diff options
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/bonding/bond_main.c | 2 | ||||
-rw-r--r-- | drivers/net/wan/hdlc_cisco.c | 2 | ||||
-rw-r--r-- | drivers/net/wan/syncppp.c | 2 | ||||
-rw-r--r-- | drivers/net/wireless/strip.c | 4 |
4 files changed, 5 insertions, 5 deletions
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c index 0fb5f653d3ce..c0bbddae4ec4 100644 --- a/drivers/net/bonding/bond_main.c +++ b/drivers/net/bonding/bond_main.c | |||
@@ -2252,7 +2252,7 @@ static u32 bond_glean_dev_ip(struct net_device *dev) | |||
2252 | { | 2252 | { |
2253 | struct in_device *idev; | 2253 | struct in_device *idev; |
2254 | struct in_ifaddr *ifa; | 2254 | struct in_ifaddr *ifa; |
2255 | u32 addr = 0; | 2255 | __be32 addr = 0; |
2256 | 2256 | ||
2257 | if (!dev) | 2257 | if (!dev) |
2258 | return 0; | 2258 | return 0; |
diff --git a/drivers/net/wan/hdlc_cisco.c b/drivers/net/wan/hdlc_cisco.c index 7ec2b2f9b7ee..b0bc5ddcf1b1 100644 --- a/drivers/net/wan/hdlc_cisco.c +++ b/drivers/net/wan/hdlc_cisco.c | |||
@@ -161,7 +161,7 @@ static int cisco_rx(struct sk_buff *skb) | |||
161 | struct hdlc_header *data = (struct hdlc_header*)skb->data; | 161 | struct hdlc_header *data = (struct hdlc_header*)skb->data; |
162 | struct cisco_packet *cisco_data; | 162 | struct cisco_packet *cisco_data; |
163 | struct in_device *in_dev; | 163 | struct in_device *in_dev; |
164 | u32 addr, mask; | 164 | __be32 addr, mask; |
165 | 165 | ||
166 | if (skb->len < sizeof(struct hdlc_header)) | 166 | if (skb->len < sizeof(struct hdlc_header)) |
167 | goto rx_error; | 167 | goto rx_error; |
diff --git a/drivers/net/wan/syncppp.c b/drivers/net/wan/syncppp.c index c13b459a0137..d1173089f334 100644 --- a/drivers/net/wan/syncppp.c +++ b/drivers/net/wan/syncppp.c | |||
@@ -763,7 +763,7 @@ static void sppp_cisco_input (struct sppp *sp, struct sk_buff *skb) | |||
763 | { | 763 | { |
764 | struct in_device *in_dev; | 764 | struct in_device *in_dev; |
765 | struct in_ifaddr *ifa; | 765 | struct in_ifaddr *ifa; |
766 | u32 addr = 0, mask = ~0; /* FIXME: is the mask correct? */ | 766 | __be32 addr = 0, mask = ~0; /* FIXME: is the mask correct? */ |
767 | #ifdef CONFIG_INET | 767 | #ifdef CONFIG_INET |
768 | rcu_read_lock(); | 768 | rcu_read_lock(); |
769 | if ((in_dev = __in_dev_get_rcu(dev)) != NULL) | 769 | if ((in_dev = __in_dev_get_rcu(dev)) != NULL) |
diff --git a/drivers/net/wireless/strip.c b/drivers/net/wireless/strip.c index ccaf28e8db0a..337c692f6fd6 100644 --- a/drivers/net/wireless/strip.c +++ b/drivers/net/wireless/strip.c | |||
@@ -1342,7 +1342,7 @@ static unsigned char *strip_make_packet(unsigned char *buffer, | |||
1342 | * 'broadcast hub' radio (First byte of address being 0xFF means broadcast) | 1342 | * 'broadcast hub' radio (First byte of address being 0xFF means broadcast) |
1343 | */ | 1343 | */ |
1344 | if (haddr.c[0] == 0xFF) { | 1344 | if (haddr.c[0] == 0xFF) { |
1345 | u32 brd = 0; | 1345 | __be32 brd = 0; |
1346 | struct in_device *in_dev; | 1346 | struct in_device *in_dev; |
1347 | 1347 | ||
1348 | rcu_read_lock(); | 1348 | rcu_read_lock(); |
@@ -1406,7 +1406,7 @@ static void strip_send(struct strip *strip_info, struct sk_buff *skb) | |||
1406 | int doreset = (long) jiffies - strip_info->watchdog_doreset >= 0; | 1406 | int doreset = (long) jiffies - strip_info->watchdog_doreset >= 0; |
1407 | int doprobe = (long) jiffies - strip_info->watchdog_doprobe >= 0 | 1407 | int doprobe = (long) jiffies - strip_info->watchdog_doprobe >= 0 |
1408 | && !doreset; | 1408 | && !doreset; |
1409 | u32 addr, brd; | 1409 | __be32 addr, brd; |
1410 | 1410 | ||
1411 | /* | 1411 | /* |
1412 | * 1. If we have a packet, encapsulate it and put it in the buffer | 1412 | * 1. If we have a packet, encapsulate it and put it in the buffer |