Skip to contentSkip to conversation

linux-next: Tree for March 24

PATCH In review Stephen Rothwell 8 participants 16 messages Mar 24, 2010 – Apr 17, 2010 1 message not in the archive

Subsystems (3)
Staging Linux-next tree Networking drivers (wireless)
lore
Share & tools
lore

Stephen Rothwell

author
#0 lore raw

Hi all,

Changes since 20100323:

Dropped tree: tmio-mmc (long unresolved conflicts and unable to fetch)

My fixes tree contains:
a patch for a pktcdvd build error from Arnd Bergmann a revert of the commit that broke virtual consoles on PowerPC

The input tree still has its build failure for which I reverted a commit.

The kgdb tree lost its conflict and build failure.

The wireless tree lost its conflicts, but gained a build failure for which I reverted a commit.

----------------------------------------------------------------------------

I have created today's linux-next tree at
git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
(patches at http://www.kernel.org/pub/linux/kernel/v2.6/next/ ). If you are tracking the linux-next tree using git, you should not use "git pull" to do so as that will try to merge the new linux-next release with the old one. You should use "git fetch" as mentioned in the FAQ on the wiki (see below).

You can see which trees have been included by looking in the Next/Trees file in the source. There are also quilt-import.log and merge.log files in the Next directory. Between each merge, the tree was built with a ppc64_defconfig for powerpc and an allmodconfig for x86_64. After the final fixups (if any), it is also built with powerpc allnoconfig (32 and 64 bit), ppc44x_defconfig and allyesconfig (minus CONFIG_PROFILE_ALL_BRANCHES - this fails its final link) and i386, sparc and sparc64 defconfig. These builds also have CONFIG_ENABLE_WARN_DEPRECATED, CONFIG_ENABLE_MUST_CHECK and CONFIG_DEBUG_INFO disabled when necessary.

Below is a summary of the state of the merge.

We are up to 158 trees (counting Linus' and 22 trees of patches pending for Linus' tree), more are welcome (even if they are currently empty). Thanks to those who have contributed, and to those who haven't, please do.

Status of my local build tests will be at
http://kisskb.ellerman.id.au/linux-next . If maintainers want to give advice about cross compilers/configs that work, we are always open to add more builds.

Thanks to Jan Dittmer for adding the linux-next tree to his build tests at http://l4x.org/k/ , the guys at http://test.kernel.org/ and Randy Dunlap for doing many randconfig builds.

There is a wiki covering stuff to do with linux-next at
http://linux.f-seidel.de/linux-next/pmwiki/ . Thanks to Frank Seidel.

Signature · 192 lines
Cheers,
Stephen Rothwell                    [email protected]

$ git checkout master
$ git reset --hard stable
Merging origin/master
Merging fixes/fixes
Merging arm-current/master
Merging m68k-current/for-linus
Merging powerpc-merge/merge
Merging sparc-current/master
Merging scsi-rc-fixes/master
Merging net-current/master
Applying: ar9170: fix for driver-core ABI change
Merging sound-current/for-linus
Merging pci-current/for-linus
Merging wireless-current/master
Merging kbuild-current/for-linus
Merging quilt/driver-core.current
Merging quilt/tty.current
Merging quilt/usb.current
Merging quilt/staging.current
Merging cpufreq-current/fixes
Merging input-current/for-linus
Merging md-current/for-linus
Merging audit-current/for-linus
Merging crypto-current/master
Merging ide-curent/master
Merging dwmw2/master
Merging gcl-current/merge
Merging arm/devel
Merging davinci/davinci-next
Merging i.MX/for-next
Merging msm/for-next
Merging omap/for-next
Merging pxa/for-next
Merging samsung/next-samsung
Merging avr32/avr32-arch
Merging blackfin/for-linus
Merging cris/for-next
Merging ia64/test
Merging m68k/for-next
Merging m68knommu/for-next
Merging microblaze/next
Merging mips/mips-for-linux-next
Merging parisc/next
Merging powerpc/next
Merging 4xx/next
Merging 52xx-and-virtex/next
Merging galak/next
Merging s390/features
Merging sh/master
Merging genesis/master
Merging sparc/master
Merging xtensa/master
Merging ceph/for-next
Merging cifs/master
Merging configfs/linux-next
Merging ecryptfs/next
Merging ext3/for_next
Merging ext4/next
Merging fatfs/master
Merging fuse/for-next
Merging gfs2/master
Merging jfs/next
Merging logfs/master
Merging nfs/linux-next
Merging nfsd/nfsd-next
Merging nilfs2/for-next
Merging ocfs2/linux-next
Merging squashfs/master
Merging udf/for_next
Merging v9fs/for-next
Merging ubifs/linux-next
Merging xfs/master
Merging reiserfs-bkl/reiserfs/kill-bkl
Merging vfs/for-next
CONFLICT (content): Merge conflict in fs/namei.c
CONFLICT (content): Merge conflict in fs/nfs/inode.c
CONFLICT (content): Merge conflict in fs/nfsd/nfs4xdr.c
CONFLICT (content): Merge conflict in fs/ufs/inode.c
CONFLICT (content): Merge conflict in fs/xfs/linux-2.6/xfs_super.c
CONFLICT (content): Merge conflict in security/tomoyo/realpath.c
Merging pci/linux-next
Merging hid/for-next
Merging quilt/i2c
Merging bjdooks-i2c/next-i2c
Merging quilt/jdelvare-hwmon
Merging quilt/kernel-doc
Merging v4l-dvb/master
Merging kbuild/for-next
Merging kconfig/for-next
Merging ide/master
Merging libata/NEXT
CONFLICT (content): Merge conflict in drivers/ata/ahci.c
Merging infiniband/for-next
Merging acpi/test
Merging ieee1394/for-next
Merging ubi/linux-next
Merging kvm/linux-next
Merging dlm/next
Merging ibft/master
Merging scsi/master
Merging async_tx/next
Merging net/master
Merging wireless/master
Merging mtd/master
CONFLICT (content): Merge conflict in drivers/mtd/nand/sh_flctl.c
Merging crypto/master
Merging sound/for-next
Merging cpufreq/next
Merging quilt/rr
CONFLICT (content): Merge conflict in MAINTAINERS
CONFLICT (content): Merge conflict in drivers/char/hvc_console.c
CONFLICT (content): Merge conflict in drivers/char/hvc_console.h
CONFLICT (content): Merge conflict in drivers/char/virtio_console.c
Merging mmc/next
Merging input/next
[master 013325c] Revert "Input: keyboard - fix formatting issues"
[master 537ff10] Revert "Input: implement SysRq as a separate input handler"
Merging lsm/for-next
Merging block/for-next
Merging quilt/device-mapper
Merging embedded/master
Merging firmware/master
Merging pcmcia/master
Merging battery/master
Merging leds/for-mm
Merging backlight/for-mm
Merging kgdb/kgdb-next
Merging slab/for-next
Merging uclinux/for-next
Merging md/for-next
Merging mfd/for-next
Merging hdlc/hdlc-next
Merging drm/drm-next
Merging voltage/for-next
Merging security-testing/next
Merging lblnet/master
Merging agp/agp-next
Merging uwb/for-upstream
Merging watchdog/master
Merging bdev/master
Merging dwmw2-iommu/master
Merging cputime/cputime
Merging osd/linux-next
Merging jc_docs/docs-next
Merging nommu/master
Merging trivial/for-next
Merging audit/for-next
Merging quilt/aoe
Merging suspend/linux-next
Merging bluetooth/master
Merging fsnotify/for-next
CONFLICT (content): Merge conflict in fs/notify/inotify/inotify_user.c
CONFLICT (content): Merge conflict in include/linux/fsnotify.h
CONFLICT (content): Merge conflict in kernel/audit_tree.c
CONFLICT (content): Merge conflict in kernel/sysctl.c
Merging irda/for-next
CONFLICT (content): Merge conflict in drivers/net/irda/irda-usb.c
Merging hwlat/for-linus
CONFLICT (content): Merge conflict in MAINTAINERS
CONFLICT (content): Merge conflict in drivers/misc/Makefile
Merging drbd/for-jens
Merging catalin/for-next
Merging alacrity/linux-next
CONFLICT (content): Merge conflict in include/linux/Kbuild
CONFLICT (content): Merge conflict in lib/Kconfig
Merging i7core_edac/linux_next
Merging devicetree/next-devicetree
Merging spi/next-spi
Merging limits/writable_limits
CONFLICT (content): Merge conflict in arch/x86/ia32/ia32entry.S
CONFLICT (content): Merge conflict in arch/x86/include/asm/unistd_32.h
CONFLICT (content): Merge conflict in arch/x86/include/asm/unistd_64.h
CONFLICT (content): Merge conflict in arch/x86/kernel/syscall_table_32.S
Merging omap_dss2/for-next
Merging tip/auto-latest
Merging edac-amd/for-next
Merging oprofile/for-next
Merging percpu/for-next
Merging workqueues/for-next
Merging sfi/sfi-test
Merging asm-generic/next
Merging hwpoison/hwpoison
Merging sysctl/master
Merging quilt/driver-core
Merging quilt/tty
Merging quilt/usb
Merging quilt/staging
Merging scsi-post-merge/master
[master 1b8afd4] Revert "ath9k_htc: Support for AR9271 chipset."
#1 lore raw
Quoted 4 lines · Stephen Rothwell

Hi all,

Changes since 20100323:

Quoted 8 lines

Dropped tree: tmio-mmc (long unresolved conflicts and unable to fetch)

My fixes tree contains:
a patch for a pktcdvd build error from Arnd Bergmann a revert of the commit that broke virtual consoles on PowerPC

The input tree still has its build failure for which I reverted a commit.

Should be fixed now.

Signature · 1 line
Dmitry
#2 lore raw

Re: linux-next: Tree for March 24 (staging/vt66*)

In reply to Stephen Rothwell
Quoted 3 lines · Stephen Rothwell

Hi all,

Changes since 20100323:

(.text+0x5d140): multiple definition of hostap_set_hostapd' (.text+0x5ccab): multiple definition of hostap_ioctl'

when
CONFIG_HOSTAP=y
and
CONFIG_VT665[56]=y

or just both of the latter are =y.

Signature · 1 line
~Randy
#3 lore raw

Re: linux-next: Tree for March 24 (staging/vt66*)

Hi,

Quoted 10 lines · Randy Dunlap
Quoted 3 lines · Stephen Rothwell

Hi all,

Changes since 20100323:

(.text+0x5d140): multiple definition of hostap_set_hostapd' (.text+0x5ccab): multiple definition of hostap_ioctl'

Quoted 6 lines

when
CONFIG_HOSTAP=y
and
CONFIG_VT665[56]=y

or just both of the latter are =y.

Is there any way to limit CONFIG_VT665[56] to ("n", "m")? That would be sufficient as a work-around, right?

Or is it preferable to rename the offending functions?

Thanks,
Forest

Signature · 3 lines
Forest Bond
http://www.alittletooquiet.net
http://www.pytagsfs.org
#4 lore raw

Re: linux-next: Tree for March 24 (staging/vt66*)

Quoted 18 lines · Forest Bond

Hi,

Quoted 15 lines · Randy Dunlap
Quoted 3 lines · Stephen Rothwell

Hi all,

Changes since 20100323:

(.text+0x5d140): multiple definition of hostap_set_hostapd' (.text+0x5ccab): multiple definition of hostap_ioctl'

when
CONFIG_HOSTAP=y
and
CONFIG_VT665[56]=y

Quoted 4 lines
Quoted 1 line

or just both of the latter are =y.

Is there any way to limit CONFIG_VT665[56] to ("n", "m")? That would be sufficient as a work-around, right?

A driver can be limited to [nm] by adding:
depends on m

Quoted 1 line

Or is it preferable to rename the offending functions?

Yes, it's preferable to rename them.

Signature · 1 line
~Randy
#5 lore raw

PATCH 1/1 vt6656: Rename hostap_set_hostapd, hostap_iotctl.

The functions hostap_set_hostapd, hostap_iotctl clashed with functions of the same name with CONFIG_HOSTAP=y and/or CONFIG_VT6655=y.

Signed-off-by Forest Bond <[email protected]>
---
 drivers/staging/vt6656/hostap.c   |    8 ++++----
 drivers/staging/vt6656/hostap.h   |    4 ++--
 drivers/staging/vt6656/ioctl.c    |    4 ++--
 drivers/staging/vt6656/main_usb.c |    2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)
drivers/staging/vt6656/hostap.c +4 -4
index 1078d61..ca007c3 100644
@@ -178,7 +178,7 @@ static int hostap_disable_hostapd(PSDevice pDevice, int rtnl_locked)
  *
  */
 
-int hostap_set_hostapd(PSDevice pDevice, int val, int rtnl_locked)
+int vt6656_hostap_set_hostapd(PSDevice pDevice, int val, int rtnl_locked)
 {
 	if (val < 0 || val > 1)
 		return -EINVAL;

@@ -744,7 +744,7 @@ static int hostap_get_encryption(PSDevice pDevice,
 
 /*
  * Description:
- *      hostap_ioctl main function supported for hostap deamon.
+ *      vt6656_hostap_ioctl main function supported for hostap deamon.
  *
  * Parameters:
  *  In:

@@ -756,7 +756,7 @@ static int hostap_get_encryption(PSDevice pDevice,
  *
  */
 
-int hostap_ioctl(PSDevice pDevice, struct iw_point *p)
+int vt6656_hostap_ioctl(PSDevice pDevice, struct iw_point *p)
 {
 	struct viawget_hostapd_param *param;
 	int ret = 0;

@@ -844,7 +844,7 @@ int hostap_ioctl(PSDevice pDevice, struct iw_point *p)
 	    return -EOPNOTSUPP;
 
 	default:
-	    DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "hostap_ioctl: unknown cmd=%d\n",
+	    DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "vt6656_hostap_ioctl: unknown cmd=%d\n",
 		       (int)param->cmd);
 		return -EOPNOTSUPP;
 		break;
drivers/staging/vt6656/hostap.h +2 -2
index 8fd667b..9e366dc 100644
@@ -61,8 +61,8 @@
 #define ARPHRD_IEEE80211 801
 #endif
 
-int hostap_set_hostapd(PSDevice pDevice, int val, int rtnl_locked);
-int hostap_ioctl(PSDevice pDevice, struct iw_point *p);
+int vt6656_hostap_set_hostapd(PSDevice pDevice, int val, int rtnl_locked);
+int vt6656_hostap_ioctl(PSDevice pDevice, struct iw_point *p);
 
 #endif // __HOSTAP_H__
drivers/staging/vt6656/ioctl.c +2 -2
index 6f33005..1ed2501 100644
@@ -412,7 +412,7 @@ int private_ioctl(PSDevice pDevice, struct ifreq *rq) {
 			break;
 		};
 		if (sValue.dwValue == 1) {
-            if (hostap_set_hostapd(pDevice, 1, 1) == 0){
+            if (vt6656_hostap_set_hostapd(pDevice, 1, 1) == 0){
                 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Enable HOSTAP\n");
             }
             else {

@@ -421,7 +421,7 @@ int private_ioctl(PSDevice pDevice, struct ifreq *rq) {
 			}
         }
         else {
-            hostap_set_hostapd(pDevice, 0, 1);
+            vt6656_hostap_set_hostapd(pDevice, 0, 1);
             DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Disable HOSTAP\n");
         }
drivers/staging/vt6656/main_usb.c +1 -1
index 49270db..c8afb66 100644
@@ -2064,7 +2064,7 @@ static int  device_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) {
 		    rc = 0;
 		}
 
-		rc = hostap_ioctl(pDevice, &wrq->u.data);
+		rc = vt6656_hostap_ioctl(pDevice, &wrq->u.data);
         break;
 
     case IOCTL_CMD_WPA:
Signature · 1 line
1.6.0.4
#6 lore raw

PATCH 1/1 vt6655: Rename hostap_set_hostapd, hostap_iotctl.

In reply to Randy Dunlap

The functions hostap_set_hostapd, hostap_iotctl clashed with functions of the same name with CONFIG_HOSTAP=y and/or CONFIG_VT6656=y.

Signed-off-by Forest Bond <[email protected]>
---
 drivers/staging/vt6655/device_main.c |    4 ++--
 drivers/staging/vt6655/hostap.c      |    8 ++++----
 drivers/staging/vt6655/hostap.h      |    4 ++--
 drivers/staging/vt6655/ioctl.c       |    4 ++--
 4 files changed, 10 insertions(+), 10 deletions(-)
drivers/staging/vt6655/device_main.c +2 -2
index 18f4dfe..ef3135c 100644
@@ -1242,7 +1242,7 @@ device_release_WPADEV(pDevice);
     }
 #ifdef HOSTAP
     if (dev)
-        hostap_set_hostapd(pDevice, 0, 0);
+        vt6655_hostap_set_hostapd(pDevice, 0, 0);
 #endif
     if (dev)
         unregister_netdev(dev);

@@ -3523,7 +3523,7 @@ static int  device_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) {
     case IOCTL_CMD_HOSTAPD:
 
 
-	rc = hostap_ioctl(pDevice, &wrq->u.data);
+	rc = vt6655_hostap_ioctl(pDevice, &wrq->u.data);
         break;
 
     case IOCTL_CMD_WPA:
drivers/staging/vt6655/hostap.c +4 -4
index 58abf44..9e07a40 100644
@@ -183,7 +183,7 @@ KeyvInitTable(&pDevice->sKey,pDevice->PortOffset);
  *
  */
 
-int hostap_set_hostapd(PSDevice pDevice, int val, int rtnl_locked)
+int vt6655_hostap_set_hostapd(PSDevice pDevice, int val, int rtnl_locked)
 {
 	if (val < 0 || val > 1)
 		return -EINVAL;

@@ -746,7 +746,7 @@ static int hostap_get_encryption(PSDevice pDevice,
 
 /*
  * Description:
- *      hostap_ioctl main function supported for hostap deamon.
+ *      vt6655_hostap_ioctl main function supported for hostap deamon.
  *
  * Parameters:
  *  In:

@@ -758,7 +758,7 @@ static int hostap_get_encryption(PSDevice pDevice,
  *
  */
 
-int hostap_ioctl(PSDevice pDevice, struct iw_point *p)
+int vt6655_hostap_ioctl(PSDevice pDevice, struct iw_point *p)
 {
 	struct viawget_hostapd_param *param;
 	int ret = 0;

@@ -846,7 +846,7 @@ int hostap_ioctl(PSDevice pDevice, struct iw_point *p)
 	    return -EOPNOTSUPP;
 
 	default:
-	    DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "hostap_ioctl: unknown cmd=%d\n",
+	    DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "vt6655_hostap_ioctl: unknown cmd=%d\n",
 		       (int)param->cmd);
 		return -EOPNOTSUPP;
 		break;
drivers/staging/vt6655/hostap.h +2 -2
index 8fd667b..55db555 100644
@@ -61,8 +61,8 @@
 #define ARPHRD_IEEE80211 801
 #endif
 
-int hostap_set_hostapd(PSDevice pDevice, int val, int rtnl_locked);
-int hostap_ioctl(PSDevice pDevice, struct iw_point *p);
+int vt6655_hostap_set_hostapd(PSDevice pDevice, int val, int rtnl_locked);
+int vt6655_hostap_ioctl(PSDevice pDevice, struct iw_point *p);
 
 #endif // __HOSTAP_H__
drivers/staging/vt6655/ioctl.c +2 -2
index d9a5fd2..f29ed9f 100644
@@ -429,7 +429,7 @@ int private_ioctl(PSDevice pDevice, struct ifreq *rq) {
 			break;
 		};
 		if (sValue.dwValue == 1) {
-            if (hostap_set_hostapd(pDevice, 1, 1) == 0){
+            if (vt6655_hostap_set_hostapd(pDevice, 1, 1) == 0){
                 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Enable HOSTAP\n");
             }
             else {

@@ -438,7 +438,7 @@ int private_ioctl(PSDevice pDevice, struct ifreq *rq) {
 			}
         }
         else {
-            hostap_set_hostapd(pDevice, 0, 1);
+            vt6655_hostap_set_hostapd(pDevice, 0, 1);
             DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Disable HOSTAP\n");
         }
Signature · 1 line
1.6.0.4
#7 lore raw

Re: linux-next: Tree for March 24 (iwlwifi)

In reply to Stephen Rothwell
Quoted 3 lines · Stephen Rothwell

Hi all,

Changes since 20100323:

drivers/net/wireless/iwlwifi/iwl-rx.c: In function 'iwl_good_ack_health':
drivers/net/wireless/iwlwifi/iwl-rx.c:647: error: 'struct iwl_priv' has no member named '_agn'

when CONFIG_IWLAGN is not enabled.

Signature · 1 line
~Randy
#8 lore raw

PATCH 1/1 iwlwifi: fix build error for CONFIG_IWLAGN=n

drivers/net/wireless/iwlwifi/iwl-rx.c: In function 'iwl_good_ack_health':
drivers/net/wireless/iwlwifi/iwl-rx.c:647: error: 'struct iwl_priv' has no member named '_agn'

Reported-by Randy Dunlap <[email protected]>
Signed-off-by John W. Linville <[email protected]>
---
 drivers/net/wireless/iwlwifi/iwl-rx.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)
drivers/net/wireless/iwlwifi/iwl-rx.c +2 -0
index b6a64d8..2fa30df 100644
@@ -621,6 +621,7 @@ static void iwl_accumulative_statistics(struct iwl_priv *priv,
 #define BA_TIMEOUT_CNT (5)
 #define BA_TIMEOUT_MAX (16)
 
+#if defined(CONFIG_IWLAGN) || defined(CONFIG_IWLAGN_MODULE)
 /**
  * iwl_good_ack_health - checks for ACK count ratios, BA timeout retries.
  *

@@ -670,6 +671,7 @@ bool iwl_good_ack_health(struct iwl_priv *priv,
 	return rc;
 }
 EXPORT_SYMBOL(iwl_good_ack_health);
+#endif
 
 /**
  * iwl_good_plcp_health - checks for plcp error.
Signature · 1 line
1.6.2.5

A message that is not in the archive (sent off-list or not yet received): 1269465799-19060-1-git-send-email-linville-2XuSBdqkA4R54TAoqtyWWQ@public.gmane.org

#10 lore raw

Re: [PATCH] iwlwifi: fix build error for CONFIG_IWLAGN=n

Quoted 20 lines · John W. Linville

drivers/net/wireless/iwlwifi/iwl-rx.c: In function 'iwl_good_ack_health':
drivers/net/wireless/iwlwifi/iwl-rx.c:647: error: 'struct iwl_priv' has no member named '_agn'

Reported-by Randy Dunlap <[email protected]>
Signed-off-by John W. Linville <[email protected]>
---
 drivers/net/wireless/iwlwifi/iwl-rx.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)
drivers/net/wireless/iwlwifi/iwl-rx.c +1 -0
index b6a64d8..2fa30df 100644
@@ -621,6 +621,7 @@ static void iwl_accumulative_statistics(struct iwl_priv *priv,
 #define BA_TIMEOUT_CNT (5)
 #define BA_TIMEOUT_MAX (16)
 
+#if defined(CONFIG_IWLAGN) || defined(CONFIG_IWLAGN_MODULE)
 /**
  * iwl_good_ack_health - checks for ACK count ratios, BA timeout
Quoted 1 line

retries.

I thought we had a patch moving it?

johannes

#11 lore raw

Re: [PATCH] iwlwifi: fix build error for CONFIG_IWLAGN=n

Quoted 18 lines · Johannes Berg
Quoted 17 lines · John W. Linville

drivers/net/wireless/iwlwifi/iwl-rx.c: In function 'iwl_good_ack_health':
drivers/net/wireless/iwlwifi/iwl-rx.c:647: error: 'struct iwl_priv' has no member named '_agn'

Reported-by Randy Dunlap <[email protected]>
Signed-off-by John W. Linville <[email protected]>
---
 drivers/net/wireless/iwlwifi/iwl-rx.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)
drivers/net/wireless/iwlwifi/iwl-rx.c +0 -0
index b6a64d8..2fa30df 100644
@@ -621,6 +621,7 @@ static void iwl_accumulative_statistics(struct iwl_priv *priv,
 #define BA_TIMEOUT_CNT (5)
 #define BA_TIMEOUT_MAX (16)
Quoted 7 lines
Quoted 4 lines
drivers/net/wireless/iwlwifi/iwl-rx.c +1 -0
+#if defined(CONFIG_IWLAGN) || defined(CONFIG_IWLAGN_MODULE)
 /**
  * iwl_good_ack_health - checks for ACK count ratios, BA timeout

retries.

I thought we had a patch moving it?

We do, but it has not been pushed upstream yet.

John, I'd prefer
http://viggo.jf.intel.com/~wifi/repos.git/?p=iwlwifi-2.6.git;a=commit;h=bc745eb7d28285f3b437c00253bf01ef501eb3f1

Should we push it upstream asap or can it wait until our next series goes out after all our validation cycles pass?

Reinette

#12 lore raw

Re: [PATCH] iwlwifi: fix build error for CONFIG_IWLAGN=n

Quoted 27 lines · reinette chatre
Quoted 18 lines · Johannes Berg
Quoted 17 lines · John W. Linville

drivers/net/wireless/iwlwifi/iwl-rx.c: In function 'iwl_good_ack_health':
drivers/net/wireless/iwlwifi/iwl-rx.c:647: error: 'struct iwl_priv' has no member named '_agn'

Reported-by Randy Dunlap <[email protected]>
Signed-off-by John W. Linville <[email protected]>
---
 drivers/net/wireless/iwlwifi/iwl-rx.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)
drivers/net/wireless/iwlwifi/iwl-rx.c +0 -0
index b6a64d8..2fa30df 100644
@@ -621,6 +621,7 @@ static void iwl_accumulative_statistics(struct iwl_priv *priv,
 #define BA_TIMEOUT_CNT (5)
 #define BA_TIMEOUT_MAX (16)
Quoted 7 lines
Quoted 4 lines
drivers/net/wireless/iwlwifi/iwl-rx.c +1 -0
+#if defined(CONFIG_IWLAGN) || defined(CONFIG_IWLAGN_MODULE)
 /**
  * iwl_good_ack_health - checks for ACK count ratios, BA timeout

retries.

I thought we had a patch moving it?

Quoted 7 lines

We do, but it has not been pushed upstream yet.

John, I'd prefer
http://viggo.jf.intel.com/~wifi/repos.git/?p=iwlwifi-2.6.git;a=commit;h=bc745eb7d28285f3b437c00253bf01ef501eb3f1

Should we push it upstream asap or can it wait until our next series goes out after all our validation cycles pass?

I can't see that link. How does the patch differ?

John

Signature · 6 lines
John W. Linville                Someday the world will need a hero, and you
[email protected]                  might be all we have.  Be ready.
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
#13 lore raw

Re: [PATCH] iwlwifi: fix build error for CONFIG_IWLAGN=n

Quoted 30 lines · John W. Linville
Quoted 29 lines · reinette chatre
Quoted 18 lines · Johannes Berg
Quoted 17 lines · John W. Linville

drivers/net/wireless/iwlwifi/iwl-rx.c: In function 'iwl_good_ack_health':
drivers/net/wireless/iwlwifi/iwl-rx.c:647: error: 'struct iwl_priv' has no member named '_agn'

Reported-by Randy Dunlap <[email protected]>
Signed-off-by John W. Linville <[email protected]>
---
 drivers/net/wireless/iwlwifi/iwl-rx.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)
drivers/net/wireless/iwlwifi/iwl-rx.c +0 -0
index b6a64d8..2fa30df 100644
@@ -621,6 +621,7 @@ static void iwl_accumulative_statistics(struct iwl_priv *priv,
 #define BA_TIMEOUT_CNT (5)
 #define BA_TIMEOUT_MAX (16)
Quoted 7 lines
Quoted 4 lines
drivers/net/wireless/iwlwifi/iwl-rx.c +1 -0
+#if defined(CONFIG_IWLAGN) || defined(CONFIG_IWLAGN_MODULE)
 /**
  * iwl_good_ack_health - checks for ACK count ratios, BA timeout

retries.

I thought we had a patch moving it?

We do, but it has not been pushed upstream yet.

Quoted 7 lines
Quoted 5 lines

John, I'd prefer
http://viggo.jf.intel.com/~wifi/repos.git/?p=iwlwifi-2.6.git;a=commit;h=bc745eb7d28285f3b437c00253bf01ef501eb3f1

Should we push it upstream asap or can it wait until our next series goes out after all our validation cycles pass?

I can't see that link. How does the patch differ?

I am very sorry, here is the correct link:
http://git.kernel.org/?p=linux/kernel/git/iwlwifi/iwlwifi-2.6.git;a=commit;h=bc745eb7d28285f3b437c00253bf01ef501eb3f1

Reinette

#14 lore raw

Re: [PATCH] iwlwifi: fix build error for CONFIG_IWLAGN=n

Quoted 2 lines · reinette chatre

I am very sorry, here is the correct link:
http://git.kernel.org/?p=linux/kernel/git/iwlwifi/iwlwifi-2.6.git;a=commit;h=bc745eb7d28285f3b437c00253bf01ef501eb3f1

FWIW, that one misses the definition of iwl_good_ack_health in iwl-core.h.

I already put the other one in wireless-next-2.6. I'll just resolve the conflict when I pull your tree.

Thanks,

John

Signature · 2 lines
John W. Linville                Someday the world will need a hero, and you
[email protected]                  might be all we have.  Be ready.
#15 lore raw

Re: [PATCH] iwlwifi: fix build error for CONFIG_IWLAGN=n

Hi John,

Quoted 6 lines · John W. Linville
Quoted 2 lines · reinette chatre

I am very sorry, here is the correct link:
http://git.kernel.org/?p=linux/kernel/git/iwlwifi/iwlwifi-2.6.git;a=commit;h=bc745eb7d28285f3b437c00253bf01ef501eb3f1

FWIW, that one misses the definition of iwl_good_ack_health in iwl-core.h.

This definition was added in an recent patch "iwlwifi: code cleanup for connectivity recovery" which is already in wireless-next-2.6.

Quoted 2 lines

I already put the other one in wireless-next-2.6. I'll just resolve the conflict when I pull your tree.

I'll try to sort this out with our next submission so that there are no conflicts to resolve.

Reinette

#16 lore raw

Re: [PATCH] iwlwifi: fix build error for CONFIG_IWLAGN=n

In reply to John W. Linville
Quoted 5 lines · John W. Linville

drivers/net/wireless/iwlwifi/iwl-rx.c: In function 'iwl_good_ack_health':
drivers/net/wireless/iwlwifi/iwl-rx.c:647: error: 'struct iwl_priv' has no member named '_agn'

Reported-by Randy Dunlap <[email protected]>
Signed-off-by John W. Linville <[email protected]>

ACK if you end up using this one.

Thanks.

Quoted 24 lines
---
 drivers/net/wireless/iwlwifi/iwl-rx.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)
drivers/net/wireless/iwlwifi/iwl-rx.c +2 -0
index b6a64d8..2fa30df 100644
@@ -621,6 +621,7 @@ static void iwl_accumulative_statistics(struct iwl_priv *priv,
 #define BA_TIMEOUT_CNT (5)
 #define BA_TIMEOUT_MAX (16)
 
+#if defined(CONFIG_IWLAGN) || defined(CONFIG_IWLAGN_MODULE)
 /**
  * iwl_good_ack_health - checks for ACK count ratios, BA timeout retries.
  *

@@ -670,6 +671,7 @@ bool iwl_good_ack_health(struct iwl_priv *priv,
 	return rc;
 }
 EXPORT_SYMBOL(iwl_good_ack_health);
+#endif
 
 /**
  * iwl_good_plcp_health - checks for plcp error.
Signature · 1 line
~Randy