---

yaml
---
r: 200879
b: refs/heads/master
c: 499031a
h: refs/heads/master
i:
  200877: f2a9062
  200875: f98684b
  200871: 8dd1217
  200863: 177266c
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e2aec372ff4b7e78e79c308104a860ae0ed20950
+refs/heads/master: 499031ac8a3df6738f6186ded9da853e8ea18253

trunk/MAINTAINERS

@@ -2978,14 +2978,22 @@ F:	drivers/net/ixgb/
 F:	drivers/net/ixgbe/
 
 INTEL PRO/WIRELESS 2100 NETWORK CONNECTION SUPPORT
+M:	Zhu Yi <yi.zhu@intel.com>
+M:	Reinette Chatre <reinette.chatre@intel.com>
+M:	Intel Linux Wireless <ilw@linux.intel.com>
 L:	linux-wireless@vger.kernel.org
-S:	Orphan
+W:	http://ipw2100.sourceforge.net
+S:	Odd Fixes
 F:	Documentation/networking/README.ipw2100
 F:	drivers/net/wireless/ipw2x00/ipw2100.*
 
 INTEL PRO/WIRELESS 2915ABG NETWORK CONNECTION SUPPORT
+M:	Zhu Yi <yi.zhu@intel.com>
+M:	Reinette Chatre <reinette.chatre@intel.com>
+M:	Intel Linux Wireless <ilw@linux.intel.com>
 L:	linux-wireless@vger.kernel.org
-S:	Orphan
+W:	http://ipw2200.sourceforge.net
+S:	Odd Fixes
 F:	Documentation/networking/README.ipw2200
 F:	drivers/net/wireless/ipw2x00/ipw2200.*
 
@@ -3011,8 +3019,8 @@ F:	drivers/net/wimax/i2400m/
 F:	include/linux/wimax/i2400m.h
 
 INTEL WIRELESS WIFI LINK (iwlwifi)
+M:	Zhu Yi <yi.zhu@intel.com>
 M:	Reinette Chatre <reinette.chatre@intel.com>
-M:	Wey-Yi Guy <wey-yi.w.guy@intel.com>
 M:	Intel Linux Wireless <ilw@linux.intel.com>
 L:	linux-wireless@vger.kernel.org
 W:	http://intellinuxwireless.org
@@ -3022,6 +3030,7 @@ F:	drivers/net/wireless/iwlwifi/
 
 INTEL WIRELESS MULTICOMM 3200 WIFI (iwmc3200wifi)
 M:	Samuel Ortiz <samuel.ortiz@intel.com>
+M:	Zhu Yi <yi.zhu@intel.com>
 M:	Intel Linux Wireless <ilw@linux.intel.com>
 L:	linux-wireless@vger.kernel.org
 S:	Supported

trunk/drivers/bluetooth/bluecard_cs.c

@@ -37,7 +37,7 @@
 #include <linux/wait.h>
 
 #include <linux/skbuff.h>
-#include <linux/io.h>
+#include <asm/io.h>
 
 #include <pcmcia/cs_types.h>
 #include <pcmcia/cs.h>

trunk/drivers/bluetooth/hci_bcsp.c

@@ -244,7 +244,7 @@ static struct sk_buff *bcsp_prepare_pkt(struct bcsp_struct *bcsp, u8 *data,
 	if (rel) {
 		hdr[0] |= 0x80 + bcsp->msgq_txseq;
 		BT_DBG("Sending packet with seqno %u", bcsp->msgq_txseq);
-		bcsp->msgq_txseq = (bcsp->msgq_txseq + 1) & 0x07;
+		bcsp->msgq_txseq = ++(bcsp->msgq_txseq) & 0x07;
 	}
 
 	if (bcsp->use_crc)

trunk/drivers/isdn/capi/kcapi.c

@@ -1020,12 +1020,12 @@ static int old_capi_manufacturer(unsigned int cmd, void __user *data)
 		if (cmd == AVMB1_ADDCARD) {
 		   if ((retval = copy_from_user(&cdef, data,
 					    sizeof(avmb1_carddef))))
-			   return -EFAULT;
+			   return retval;
 		   cdef.cardtype = AVM_CARDTYPE_B1;
 		} else {
 		   if ((retval = copy_from_user(&cdef, data,
 					    sizeof(avmb1_extcarddef))))
-			   return -EFAULT;
+			   return retval;
 		}
 		cparams.port = cdef.port;
 		cparams.irq = cdef.irq;
@@ -1218,7 +1218,7 @@ int capi20_manufacturer(unsigned int cmd, void __user *data)
 		kcapi_carddef cdef;
 
 		if ((retval = copy_from_user(&cdef, data, sizeof(cdef))))
-			return -EFAULT;
+			return retval;
 
 		cparams.port = cdef.port;
 		cparams.irq = cdef.irq;

trunk/drivers/isdn/gigaset/asyncdata.c

@@ -126,6 +126,26 @@ static unsigned lock_loop(unsigned numbytes, struct inbuf_t *inbuf)
 	return numbytes;
 }
 
+/* set up next receive skb for data mode
+ */
+static void new_rcv_skb(struct bc_state *bcs)
+{
+	struct cardstate *cs = bcs->cs;
+	unsigned short hw_hdr_len = cs->hw_hdr_len;
+
+	if (bcs->ignore) {
+		bcs->skb = NULL;
+		return;
+	}
+
+	bcs->skb = dev_alloc_skb(SBUFSIZE + hw_hdr_len);
+	if (bcs->skb == NULL) {
+		dev_warn(cs->dev, "could not allocate new skb\n");
+		return;
+	}
+	skb_reserve(bcs->skb, hw_hdr_len);
+}
+
 /* process a block of received bytes in HDLC data mode
  * (mstate != MS_LOCKED && !(inputstate & INS_command) && proto2 == L2_HDLC)
  * Collect HDLC frames, undoing byte stuffing and watching for DLE escapes.
@@ -139,8 +159,8 @@ static unsigned hdlc_loop(unsigned numbytes, struct inbuf_t *inbuf)
 	struct cardstate *cs = inbuf->cs;
 	struct bc_state *bcs = cs->bcs;
 	int inputstate = bcs->inputstate;
-	__u16 fcs = bcs->rx_fcs;
-	struct sk_buff *skb = bcs->rx_skb;
+	__u16 fcs = bcs->fcs;
+	struct sk_buff *skb = bcs->skb;
 	unsigned char *src = inbuf->data + inbuf->head;
 	unsigned procbytes = 0;
 	unsigned char c;
@@ -225,7 +245,8 @@ static unsigned hdlc_loop(unsigned numbytes, struct inbuf_t *inbuf)
 
 				/* prepare reception of next frame */
 				inputstate &= ~INS_have_data;
-				skb = gigaset_new_rx_skb(bcs);
+				new_rcv_skb(bcs);
+				skb = bcs->skb;
 			} else {
 				/* empty frame (7E 7E) */
 #ifdef CONFIG_GIGASET_DEBUG
@@ -234,7 +255,8 @@ static unsigned hdlc_loop(unsigned numbytes, struct inbuf_t *inbuf)
 				if (!skb) {
 					/* skipped (?) */
 					gigaset_isdn_rcv_err(bcs);
-					skb = gigaset_new_rx_skb(bcs);
+					new_rcv_skb(bcs);
+					skb = bcs->skb;
 				}
 			}
 
@@ -257,11 +279,11 @@ static unsigned hdlc_loop(unsigned numbytes, struct inbuf_t *inbuf)
 #endif
 		inputstate |= INS_have_data;
 		if (skb) {
-			if (skb->len >= bcs->rx_bufsize) {
+			if (skb->len == SBUFSIZE) {
 				dev_warn(cs->dev, "received packet too long\n");
 				dev_kfree_skb_any(skb);
 				/* skip remainder of packet */
-				bcs->rx_skb = skb = NULL;
+				bcs->skb = skb = NULL;
 			} else {
 				*__skb_put(skb, 1) = c;
 				fcs = crc_ccitt_byte(fcs, c);
@@ -270,7 +292,7 @@ static unsigned hdlc_loop(unsigned numbytes, struct inbuf_t *inbuf)
 	}
 
 	bcs->inputstate = inputstate;
-	bcs->rx_fcs = fcs;
+	bcs->fcs = fcs;
 	return procbytes;
 }
 
@@ -286,18 +308,18 @@ static unsigned iraw_loop(unsigned numbytes, struct inbuf_t *inbuf)
 	struct cardstate *cs = inbuf->cs;
 	struct bc_state *bcs = cs->bcs;
 	int inputstate = bcs->inputstate;
-	struct sk_buff *skb = bcs->rx_skb;
+	struct sk_buff *skb = bcs->skb;
 	unsigned char *src = inbuf->data + inbuf->head;
 	unsigned procbytes = 0;
 	unsigned char c;
 
 	if (!skb) {
 		/* skip this block */
-		gigaset_new_rx_skb(bcs);
+		new_rcv_skb(bcs);
 		return numbytes;
 	}
 
-	while (procbytes < numbytes && skb->len < bcs->rx_bufsize) {
+	while (procbytes < numbytes && skb->len < SBUFSIZE) {
 		c = *src++;
 		procbytes++;
 
@@ -321,7 +343,7 @@ static unsigned iraw_loop(unsigned numbytes, struct inbuf_t *inbuf)
 	if (inputstate & INS_have_data) {
 		gigaset_skb_rcvd(bcs, skb);
 		inputstate &= ~INS_have_data;
-		gigaset_new_rx_skb(bcs);
+		new_rcv_skb(bcs);
 	}
 
 	bcs->inputstate = inputstate;