Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 (c649c0e3) · Commits · e / devices / android_kernel_fairphone_FP5

drivers/isdn/gigaset/isocdata.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -175,7 +175,7 @@ int gigaset_isowbuf_getbytes(struct isowbuf_t *iwb, int size)
	return -EINVAL;		return -EINVAL;
	}		}
	src = iwb->read;		src = iwb->read;
	if (unlikely(limit > BAS_OUTBUFSIZE + BAS_OUTBUFPAD \|\|		if (unlikely(limit >= BAS_OUTBUFSIZE + BAS_OUTBUFPAD \|\|
	(read < src && limit >= src))) {		(read < src && limit >= src))) {
	pr_err("isoc write buffer frame reservation violated\n");		pr_err("isoc write buffer frame reservation violated\n");
	return -EFAULT;		return -EFAULT;

drivers/net/gianfar.c

+10 −1

Original line number	Original line	Diff line number	Diff line
	@@ -1851,8 +1851,17 @@ int gfar_clean_rx_ring(struct net_device *dev, int rx_work_limit)

	if (unlikely(!newskb))		if (unlikely(!newskb))
	newskb = skb;		newskb = skb;
	else if (skb)		else if (skb) {
			/*
			* We need to reset ->data to what it
			* was before gfar_new_skb() re-aligned
			* it to an RXBUF_ALIGNMENT boundary
			* before we put the skb back on the
			* recycle list.
			*/
			skb->data = skb->head + NET_SKB_PAD;
	__skb_queue_head(&priv->rx_recycle, skb);		__skb_queue_head(&priv->rx_recycle, skb);
			}
	} else {		} else {
	/* Increment the number of packets */		/* Increment the number of packets */
	dev->stats.rx_packets++;		dev->stats.rx_packets++;

drivers/net/wireless/airo.c

+14 −9

Original line number	Original line	Diff line number	Diff line
	@@ -6467,6 +6467,7 @@ static int airo_get_encode(struct net_device *dev,
	{		{
	struct airo_info *local = dev->ml_priv;		struct airo_info *local = dev->ml_priv;
	int index = (dwrq->flags & IW_ENCODE_INDEX) - 1;		int index = (dwrq->flags & IW_ENCODE_INDEX) - 1;
			int wep_key_len;
	u8 buf[16];		u8 buf[16];

	if (!local->wep_capable)		if (!local->wep_capable)
	@@ -6500,11 +6501,13 @@ static int airo_get_encode(struct net_device *dev,
	dwrq->flags \|= index + 1;		dwrq->flags \|= index + 1;

	/* Copy the key to the user buffer */		/* Copy the key to the user buffer */
	dwrq->length = get_wep_key(local, index, &buf[0], sizeof(buf));		wep_key_len = get_wep_key(local, index, &buf[0], sizeof(buf));
	if (dwrq->length != -1)		if (wep_key_len < 0) {
	memcpy(extra, buf, dwrq->length);
	else
	dwrq->length = 0;		dwrq->length = 0;
			} else {
			dwrq->length = wep_key_len;
			memcpy(extra, buf, dwrq->length);
			}

	return 0;		return 0;
	}		}
	@@ -6617,7 +6620,7 @@ static int airo_get_encodeext(struct net_device *dev,
	struct airo_info *local = dev->ml_priv;		struct airo_info *local = dev->ml_priv;
	struct iw_point *encoding = &wrqu->encoding;		struct iw_point *encoding = &wrqu->encoding;
	struct iw_encode_ext ext = (struct iw_encode_ext )extra;		struct iw_encode_ext ext = (struct iw_encode_ext )extra;
	int idx, max_key_len;		int idx, max_key_len, wep_key_len;
	u8 buf[16];		u8 buf[16];

	if (!local->wep_capable)		if (!local->wep_capable)
	@@ -6661,11 +6664,13 @@ static int airo_get_encodeext(struct net_device *dev,
	memset(extra, 0, 16);		memset(extra, 0, 16);

	/* Copy the key to the user buffer */		/* Copy the key to the user buffer */
	ext->key_len = get_wep_key(local, idx, &buf[0], sizeof(buf));		wep_key_len = get_wep_key(local, idx, &buf[0], sizeof(buf));
	if (ext->key_len != -1)		if (wep_key_len < 0) {
	memcpy(extra, buf, ext->key_len);
	else
	ext->key_len = 0;		ext->key_len = 0;
			} else {
			ext->key_len = wep_key_len;
			memcpy(extra, buf, ext->key_len);
			}

	return 0;		return 0;
	}		}

drivers/net/wireless/ath/ath5k/reset.c

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -26,7 +26,7 @@
	\*****************************/		\*****************************/

	#include <linux/pci.h> /* To determine if a card is pci-e */		#include <linux/pci.h> /* To determine if a card is pci-e */
	#include <linux/bitops.h> /* For get_bitmask_order */		#include <linux/log2.h>
	#include "ath5k.h"		#include "ath5k.h"
	#include "reg.h"		#include "reg.h"
	#include "base.h"		#include "base.h"
	@@ -68,10 +68,10 @@ static inline int ath5k_hw_write_ofdm_timings(struct ath5k_hw *ah,

	/* Get exponent		/* Get exponent
	* ALGO: coef_exp = 14 - highest set bit position */		* ALGO: coef_exp = 14 - highest set bit position */
	coef_exp = get_bitmask_order(coef_scaled);		coef_exp = ilog2(coef_scaled);

	/* Doesn't make sense if it's zero*/		/* Doesn't make sense if it's zero*/
	if (!coef_exp)		if (!coef_scaled \|\| !coef_exp)
	return -EINVAL;		return -EINVAL;

	/* Note: we've shifted coef_scaled by 24 */		/* Note: we've shifted coef_scaled by 24 */

drivers/net/wireless/iwlwifi/iwl-5000.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -46,7 +46,7 @@
	#include "iwl-6000-hw.h"		#include "iwl-6000-hw.h"

	/* Highest firmware API version supported */		/* Highest firmware API version supported */
	#define IWL5000_UCODE_API_MAX 1		#define IWL5000_UCODE_API_MAX 2
	#define IWL5150_UCODE_API_MAX 2		#define IWL5150_UCODE_API_MAX 2

	/* Lowest firmware API version supported */		/* Lowest firmware API version supported */