Merge ssh://master.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem (31ec97d9) · Commits · e / devices / android_kernel_sony_msm8994

drivers/bcma/host_pci.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -171,6 +171,7 @@ static void bcma_host_pci_remove(struct pci_dev *dev)
		}

		static DEFINE_PCI_DEVICE_TABLE(bcma_pci_bridge_tbl) = {
		{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x0576) },
		{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4331) },
		{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4353) },
		{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4727) },

drivers/net/wireless/airo.c

+11 −22

Original line number	Diff line number	Diff line
		@@ -4500,8 +4500,7 @@ static int setup_proc_entry( struct net_device *dev,
		struct proc_dir_entry *entry;
		/* First setup the device directory */
		strcpy(apriv->proc_name,dev->name);
		apriv->proc_entry = create_proc_entry(apriv->proc_name,
		S_IFDIR\|airo_perm,
		apriv->proc_entry = proc_mkdir_mode(apriv->proc_name, airo_perm,
		airo_entry);
		if (!apriv->proc_entry)
		goto fail;
		@@ -4509,8 +4508,7 @@ static int setup_proc_entry( struct net_device *dev,
		apriv->proc_entry->gid = proc_gid;

		/* Setup the StatsDelta */
		entry = proc_create_data("StatsDelta",
		S_IFREG \| (S_IRUGO&proc_perm),
		entry = proc_create_data("StatsDelta", S_IRUGO & proc_perm,
		apriv->proc_entry, &proc_statsdelta_ops, dev);
		if (!entry)
		goto fail_stats_delta;
		@@ -4518,8 +4516,7 @@ static int setup_proc_entry( struct net_device *dev,
		entry->gid = proc_gid;

		/* Setup the Stats */
		entry = proc_create_data("Stats",
		S_IFREG \| (S_IRUGO&proc_perm),
		entry = proc_create_data("Stats", S_IRUGO & proc_perm,
		apriv->proc_entry, &proc_stats_ops, dev);
		if (!entry)
		goto fail_stats;
		@@ -4527,8 +4524,7 @@ static int setup_proc_entry( struct net_device *dev,
		entry->gid = proc_gid;

		/* Setup the Status */
		entry = proc_create_data("Status",
		S_IFREG \| (S_IRUGO&proc_perm),
		entry = proc_create_data("Status", S_IRUGO & proc_perm,
		apriv->proc_entry, &proc_status_ops, dev);
		if (!entry)
		goto fail_status;
		@@ -4536,8 +4532,7 @@ static int setup_proc_entry( struct net_device *dev,
		entry->gid = proc_gid;

		/* Setup the Config */
		entry = proc_create_data("Config",
		S_IFREG \| proc_perm,
		entry = proc_create_data("Config", proc_perm,
		apriv->proc_entry, &proc_config_ops, dev);
		if (!entry)
		goto fail_config;
		@@ -4545,8 +4540,7 @@ static int setup_proc_entry( struct net_device *dev,
		entry->gid = proc_gid;

		/* Setup the SSID */
		entry = proc_create_data("SSID",
		S_IFREG \| proc_perm,
		entry = proc_create_data("SSID", proc_perm,
		apriv->proc_entry, &proc_SSID_ops, dev);
		if (!entry)
		goto fail_ssid;
		@@ -4554,8 +4548,7 @@ static int setup_proc_entry( struct net_device *dev,
		entry->gid = proc_gid;

		/* Setup the APList */
		entry = proc_create_data("APList",
		S_IFREG \| proc_perm,
		entry = proc_create_data("APList", proc_perm,
		apriv->proc_entry, &proc_APList_ops, dev);
		if (!entry)
		goto fail_aplist;
		@@ -4563,8 +4556,7 @@ static int setup_proc_entry( struct net_device *dev,
		entry->gid = proc_gid;

		/* Setup the BSSList */
		entry = proc_create_data("BSSList",
		S_IFREG \| proc_perm,
		entry = proc_create_data("BSSList", proc_perm,
		apriv->proc_entry, &proc_BSSList_ops, dev);
		if (!entry)
		goto fail_bsslist;
		@@ -4572,8 +4564,7 @@ static int setup_proc_entry( struct net_device *dev,
		entry->gid = proc_gid;

		/* Setup the WepKey */
		entry = proc_create_data("WepKey",
		S_IFREG \| proc_perm,
		entry = proc_create_data("WepKey", proc_perm,
		apriv->proc_entry, &proc_wepkey_ops, dev);
		if (!entry)
		goto fail_wepkey;
		@@ -5705,9 +5696,7 @@ static int __init airo_init_module( void )
		{
		int i;

		airo_entry = create_proc_entry("driver/aironet",
		S_IFDIR \| airo_perm,
		NULL);
		airo_entry = proc_mkdir_mode("driver/aironet", airo_perm, NULL);

		if (airo_entry) {
		airo_entry->uid = proc_uid;

drivers/net/wireless/ath/ath9k/ahb.c

+1 −1

Original line number	Diff line number	Diff line
		/*
		* Copyright (c) 2008-2009 Atheros Communications Inc.
		* Copyright (c) 2008-2011 Atheros Communications Inc.
		* Copyright (c) 2009 Gabor Juhos <juhosg@openwrt.org>
		* Copyright (c) 2009 Imre Kaloz <kaloz@openwrt.org>
		*

drivers/net/wireless/ath/ath9k/ani.c

+1 −1

Original line number	Diff line number	Diff line
		/*
		* Copyright (c) 2008-2010 Atheros Communications Inc.
		* Copyright (c) 2008-2011 Atheros Communications Inc.
		*
		* Permission to use, copy, modify, and/or distribute this software for any
		* purpose with or without fee is hereby granted, provided that the above

drivers/net/wireless/ath/ath9k/ani.h

+1 −1

Original line number	Diff line number	Diff line
		/*
		* Copyright (c) 2008-2009 Atheros Communications Inc.
		* Copyright (c) 2008-2011 Atheros Communications Inc.
		*
		* Permission to use, copy, modify, and/or distribute this software for any
		* purpose with or without fee is hereby granted, provided that the above