diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-23 14:47:02 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-23 14:47:02 -0400 |
commit | 5f05647dd81c11a6a165ccc8f0c1370b16f3bcb0 (patch) | |
tree | 7851ef1c93aa1aba7ef327ca4b75fd35e6d10f29 /drivers/net/irda | |
parent | 02f36038c568111ad4fc433f6fa760ff5e38fab4 (diff) | |
parent | ec37a48d1d16c30b655ac5280209edf52a6775d4 (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6: (1699 commits)
bnx2/bnx2x: Unsupported Ethtool operations should return -EINVAL.
vlan: Calling vlan_hwaccel_do_receive() is always valid.
tproxy: use the interface primary IP address as a default value for --on-ip
tproxy: added IPv6 support to the socket match
cxgb3: function namespace cleanup
tproxy: added IPv6 support to the TPROXY target
tproxy: added IPv6 socket lookup function to nf_tproxy_core
be2net: Changes to use only priority codes allowed by f/w
tproxy: allow non-local binds of IPv6 sockets if IP_TRANSPARENT is enabled
tproxy: added tproxy sockopt interface in the IPV6 layer
tproxy: added udp6_lib_lookup function
tproxy: added const specifiers to udp lookup functions
tproxy: split off ipv6 defragmentation to a separate module
l2tp: small cleanup
nf_nat: restrict ICMP translation for embedded header
can: mcp251x: fix generation of error frames
can: mcp251x: fix endless loop in interrupt handler if CANINTF_MERRF is set
can-raw: add msg_flags to distinguish local traffic
9p: client code cleanup
rds: make local functions/variables static
...
Fix up conflicts in net/core/dev.c, drivers/net/pcmcia/smc91c92_cs.c and
drivers/net/wireless/ath/ath9k/debug.c as per David
Diffstat (limited to 'drivers/net/irda')
-rw-r--r-- | drivers/net/irda/donauboe.c | 4 | ||||
-rw-r--r-- | drivers/net/irda/irda-usb.c | 10 | ||||
-rw-r--r-- | drivers/net/irda/mcs7780.c | 2 | ||||
-rw-r--r-- | drivers/net/irda/nsc-ircc.c | 2 | ||||
-rw-r--r-- | drivers/net/irda/sir_dev.c | 2 | ||||
-rw-r--r-- | drivers/net/irda/smsc-ircc2.c | 2 | ||||
-rw-r--r-- | drivers/net/irda/stir4200.c | 2 | ||||
-rw-r--r-- | drivers/net/irda/via-ircc.c | 3 | ||||
-rw-r--r-- | drivers/net/irda/via-ircc.h | 2 | ||||
-rw-r--r-- | drivers/net/irda/vlsi_ir.h | 2 |
10 files changed, 16 insertions, 15 deletions
diff --git a/drivers/net/irda/donauboe.c b/drivers/net/irda/donauboe.c index 48bd5ec9f29b..b626cccbccd1 100644 --- a/drivers/net/irda/donauboe.c +++ b/drivers/net/irda/donauboe.c | |||
@@ -217,7 +217,7 @@ toshoboe_checkfcs (unsigned char *buf, int len) | |||
217 | for (i = 0; i < len; ++i) | 217 | for (i = 0; i < len; ++i) |
218 | fcs.value = irda_fcs (fcs.value, *(buf++)); | 218 | fcs.value = irda_fcs (fcs.value, *(buf++)); |
219 | 219 | ||
220 | return (fcs.value == GOOD_FCS); | 220 | return fcs.value == GOOD_FCS; |
221 | } | 221 | } |
222 | 222 | ||
223 | /***********************************************************************/ | 223 | /***********************************************************************/ |
@@ -759,7 +759,7 @@ toshoboe_maketestpacket (unsigned char *buf, int badcrc, int fir) | |||
759 | if (fir) | 759 | if (fir) |
760 | { | 760 | { |
761 | memset (buf, 0, TT_LEN); | 761 | memset (buf, 0, TT_LEN); |
762 | return (TT_LEN); | 762 | return TT_LEN; |
763 | } | 763 | } |
764 | 764 | ||
765 | fcs.value = INIT_FCS; | 765 | fcs.value = INIT_FCS; |
diff --git a/drivers/net/irda/irda-usb.c b/drivers/net/irda/irda-usb.c index 4441fa3389c2..e4ea61944c22 100644 --- a/drivers/net/irda/irda-usb.c +++ b/drivers/net/irda/irda-usb.c | |||
@@ -1124,11 +1124,11 @@ static int stir421x_patch_device(struct irda_usb_cb *self) | |||
1124 | * The actual image starts after the "STMP" keyword | 1124 | * The actual image starts after the "STMP" keyword |
1125 | * so forward to the firmware header tag | 1125 | * so forward to the firmware header tag |
1126 | */ | 1126 | */ |
1127 | for (i = 0; (fw->data[i] != STIR421X_PATCH_END_OF_HDR_TAG) && | 1127 | for (i = 0; i < fw->size && fw->data[i] != |
1128 | (i < fw->size); i++) ; | 1128 | STIR421X_PATCH_END_OF_HDR_TAG; i++) ; |
1129 | /* here we check for the out of buffer case */ | 1129 | /* here we check for the out of buffer case */ |
1130 | if ((STIR421X_PATCH_END_OF_HDR_TAG == fw->data[i]) && | 1130 | if (i < STIR421X_PATCH_CODE_OFFSET && i < fw->size && |
1131 | (i < STIR421X_PATCH_CODE_OFFSET)) { | 1131 | STIR421X_PATCH_END_OF_HDR_TAG == fw->data[i]) { |
1132 | if (!memcmp(fw->data + i + 1, STIR421X_PATCH_STMP_TAG, | 1132 | if (!memcmp(fw->data + i + 1, STIR421X_PATCH_STMP_TAG, |
1133 | sizeof(STIR421X_PATCH_STMP_TAG) - 1)) { | 1133 | sizeof(STIR421X_PATCH_STMP_TAG) - 1)) { |
1134 | 1134 | ||
@@ -1514,7 +1514,7 @@ static inline int irda_usb_parse_endpoints(struct irda_usb_cb *self, struct usb_ | |||
1514 | IRDA_DEBUG(0, "%s(), And our endpoints are : in=%02X, out=%02X (%d), int=%02X\n", | 1514 | IRDA_DEBUG(0, "%s(), And our endpoints are : in=%02X, out=%02X (%d), int=%02X\n", |
1515 | __func__, self->bulk_in_ep, self->bulk_out_ep, self->bulk_out_mtu, self->bulk_int_ep); | 1515 | __func__, self->bulk_in_ep, self->bulk_out_ep, self->bulk_out_mtu, self->bulk_int_ep); |
1516 | 1516 | ||
1517 | return((self->bulk_in_ep != 0) && (self->bulk_out_ep != 0)); | 1517 | return (self->bulk_in_ep != 0) && (self->bulk_out_ep != 0); |
1518 | } | 1518 | } |
1519 | 1519 | ||
1520 | #ifdef IU_DUMP_CLASS_DESC | 1520 | #ifdef IU_DUMP_CLASS_DESC |
diff --git a/drivers/net/irda/mcs7780.c b/drivers/net/irda/mcs7780.c index 5b1036ac38d7..74b20f179cea 100644 --- a/drivers/net/irda/mcs7780.c +++ b/drivers/net/irda/mcs7780.c | |||
@@ -734,7 +734,7 @@ static int mcs_net_open(struct net_device *netdev) | |||
734 | } | 734 | } |
735 | 735 | ||
736 | if (!mcs_setup_urbs(mcs)) | 736 | if (!mcs_setup_urbs(mcs)) |
737 | goto error3; | 737 | goto error3; |
738 | 738 | ||
739 | ret = mcs_receive_start(mcs); | 739 | ret = mcs_receive_start(mcs); |
740 | if (ret) | 740 | if (ret) |
diff --git a/drivers/net/irda/nsc-ircc.c b/drivers/net/irda/nsc-ircc.c index e30cdbb14745..559fe854d76d 100644 --- a/drivers/net/irda/nsc-ircc.c +++ b/drivers/net/irda/nsc-ircc.c | |||
@@ -1348,7 +1348,7 @@ static __u8 nsc_ircc_change_speed(struct nsc_ircc_cb *self, __u32 speed) | |||
1348 | outb(bank, iobase+BSR); | 1348 | outb(bank, iobase+BSR); |
1349 | 1349 | ||
1350 | /* Make sure interrupt handlers keep the proper interrupt mask */ | 1350 | /* Make sure interrupt handlers keep the proper interrupt mask */ |
1351 | return(ier); | 1351 | return ier; |
1352 | } | 1352 | } |
1353 | 1353 | ||
1354 | /* | 1354 | /* |
diff --git a/drivers/net/irda/sir_dev.c b/drivers/net/irda/sir_dev.c index 51d74447f8f8..efe05bb34dd8 100644 --- a/drivers/net/irda/sir_dev.c +++ b/drivers/net/irda/sir_dev.c | |||
@@ -336,7 +336,7 @@ static int sirdev_is_receiving(struct sir_dev *dev) | |||
336 | if (!atomic_read(&dev->enable_rx)) | 336 | if (!atomic_read(&dev->enable_rx)) |
337 | return 0; | 337 | return 0; |
338 | 338 | ||
339 | return (dev->rx_buff.state != OUTSIDE_FRAME); | 339 | return dev->rx_buff.state != OUTSIDE_FRAME; |
340 | } | 340 | } |
341 | 341 | ||
342 | int sirdev_set_dongle(struct sir_dev *dev, IRDA_DONGLE type) | 342 | int sirdev_set_dongle(struct sir_dev *dev, IRDA_DONGLE type) |
diff --git a/drivers/net/irda/smsc-ircc2.c b/drivers/net/irda/smsc-ircc2.c index 850ca1c5ee19..8c57bfb5f098 100644 --- a/drivers/net/irda/smsc-ircc2.c +++ b/drivers/net/irda/smsc-ircc2.c | |||
@@ -2051,7 +2051,7 @@ static int smsc_ircc_sir_write(int iobase, int fifo_size, __u8 *buf, int len) | |||
2051 | */ | 2051 | */ |
2052 | static int smsc_ircc_is_receiving(struct smsc_ircc_cb *self) | 2052 | static int smsc_ircc_is_receiving(struct smsc_ircc_cb *self) |
2053 | { | 2053 | { |
2054 | return (self->rx_buff.state != OUTSIDE_FRAME); | 2054 | return self->rx_buff.state != OUTSIDE_FRAME; |
2055 | } | 2055 | } |
2056 | 2056 | ||
2057 | 2057 | ||
diff --git a/drivers/net/irda/stir4200.c b/drivers/net/irda/stir4200.c index e5698fa30a4f..41c96b3d8152 100644 --- a/drivers/net/irda/stir4200.c +++ b/drivers/net/irda/stir4200.c | |||
@@ -219,7 +219,7 @@ static inline int read_reg(struct stir_cb *stir, __u16 reg, | |||
219 | 219 | ||
220 | static inline int isfir(u32 speed) | 220 | static inline int isfir(u32 speed) |
221 | { | 221 | { |
222 | return (speed == 4000000); | 222 | return speed == 4000000; |
223 | } | 223 | } |
224 | 224 | ||
225 | /* | 225 | /* |
diff --git a/drivers/net/irda/via-ircc.c b/drivers/net/irda/via-ircc.c index b0a6cd815be1..67c0ad42d818 100644 --- a/drivers/net/irda/via-ircc.c +++ b/drivers/net/irda/via-ircc.c | |||
@@ -1182,12 +1182,13 @@ F01_E */ | |||
1182 | 1182 | ||
1183 | skb = dev_alloc_skb(len + 1 - 4); | 1183 | skb = dev_alloc_skb(len + 1 - 4); |
1184 | /* | 1184 | /* |
1185 | * if frame size,data ptr,or skb ptr are wrong ,the get next | 1185 | * if frame size, data ptr, or skb ptr are wrong, then get next |
1186 | * entry. | 1186 | * entry. |
1187 | */ | 1187 | */ |
1188 | if ((skb == NULL) || (skb->data == NULL) || | 1188 | if ((skb == NULL) || (skb->data == NULL) || |
1189 | (self->rx_buff.data == NULL) || (len < 6)) { | 1189 | (self->rx_buff.data == NULL) || (len < 6)) { |
1190 | self->netdev->stats.rx_dropped++; | 1190 | self->netdev->stats.rx_dropped++; |
1191 | kfree_skb(skb); | ||
1191 | return TRUE; | 1192 | return TRUE; |
1192 | } | 1193 | } |
1193 | skb_reserve(skb, 1); | 1194 | skb_reserve(skb, 1); |
diff --git a/drivers/net/irda/via-ircc.h b/drivers/net/irda/via-ircc.h index 5a84822b5a43..c6f58482b769 100644 --- a/drivers/net/irda/via-ircc.h +++ b/drivers/net/irda/via-ircc.h | |||
@@ -238,7 +238,7 @@ static void WriteLPCReg(int iRegNum, unsigned char iVal) | |||
238 | 238 | ||
239 | static __u8 ReadReg(unsigned int BaseAddr, int iRegNum) | 239 | static __u8 ReadReg(unsigned int BaseAddr, int iRegNum) |
240 | { | 240 | { |
241 | return ((__u8) inb(BaseAddr + iRegNum)); | 241 | return (__u8) inb(BaseAddr + iRegNum); |
242 | } | 242 | } |
243 | 243 | ||
244 | static void WriteReg(unsigned int BaseAddr, int iRegNum, unsigned char iVal) | 244 | static void WriteReg(unsigned int BaseAddr, int iRegNum, unsigned char iVal) |
diff --git a/drivers/net/irda/vlsi_ir.h b/drivers/net/irda/vlsi_ir.h index 3f24a1f33022..d66fab854bf1 100644 --- a/drivers/net/irda/vlsi_ir.h +++ b/drivers/net/irda/vlsi_ir.h | |||
@@ -595,7 +595,7 @@ struct ring_descr { | |||
595 | 595 | ||
596 | static inline int rd_is_active(struct ring_descr *rd) | 596 | static inline int rd_is_active(struct ring_descr *rd) |
597 | { | 597 | { |
598 | return ((rd->hw->rd_status & RD_ACTIVE) != 0); | 598 | return (rd->hw->rd_status & RD_ACTIVE) != 0; |
599 | } | 599 | } |
600 | 600 | ||
601 | static inline void rd_activate(struct ring_descr *rd) | 601 | static inline void rd_activate(struct ring_descr *rd) |