net-2.6 merged into net-next-2.6

net-2.6 merged into net-next-2.6

[David Miller]

There were a few small wireless conflicts but I think
I handled them correctly.

Please send me any fixup patches which might be necessary.

Thanks!

Re: net-2.6 merged into net-next-2.6

[John W. Linville]

On Tue, Jun 10, 2008 at 02:50:59AM -0700, David Miller wrote:
> 
> There were a few small wireless conflicts but I think
> I handled them correctly.
> 
> Please send me any fixup patches which might be necessary.

Just one, which was easy to miss:

The following changes since commit 65b53e4cc90e59936733b3b95b9451d2ca47528d:
  David S. Miller (1):
        Merge branch 'master' of master.kernel.org:/.../davem/net-2.6

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6.git
master

John W. Linville (1):
      rt2x00dev.c: fix-up merge damage

 drivers/net/wireless/rt2x00/rt2x00dev.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/net/wireless/rt2x00/rt2x00dev.c b/drivers/net/wireless/rt2x00/rt2x00dev.c
index f7a4417..dc5ab90 100644
--- a/drivers/net/wireless/rt2x00/rt2x00dev.c
+++ b/drivers/net/wireless/rt2x00/rt2x00dev.c
@@ -507,7 +507,7 @@ void rt2x00lib_txdone(struct queue_entry *entry,
 	rt2x00dev->link.qual.tx_success +=
 	    test_bit(TXDONE_SUCCESS, &txdesc->flags);
 	rt2x00dev->link.qual.tx_failed +=
-	    txdesc->retry + !!test_bit(TXDONE_FAILURE, &txdesc->flags);
+	    test_bit(TXDONE_FAILURE, &txdesc->flags);
 
 	/*
 	 * Initialize TX status
-- 
John W. Linville
linville@tuxdriver.com

Re: net-2.6 merged into net-next-2.6

[John W. Linville]

On Tue, Jun 10, 2008 at 12:02:12PM -0400, John W. Linville wrote:
> On Tue, Jun 10, 2008 at 02:50:59AM -0700, David Miller wrote:
> > 
> > There were a few small wireless conflicts but I think
> > I handled them correctly.
> > 
> > Please send me any fixup patches which might be necessary.
> 
> Just one, which was easy to miss:

Oops, found another one...

The following changes since commit 65b53e4cc90e59936733b3b95b9451d2ca47528d:
  David S. Miller (1):
        Merge branch 'master' of master.kernel.org:/.../davem/net-2.6

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6.git master

John W. Linville (2):
      rt2x00dev.c: fix-up merge damage
      net/mac80211/ieee80211_i.h: fix-up merge damage

 drivers/net/wireless/rt2x00/rt2x00dev.c |    2 +-
 net/mac80211/ieee80211_i.h              |   21 ---------------------
 2 files changed, 1 insertions(+), 22 deletions(-)

diff --git a/drivers/net/wireless/rt2x00/rt2x00dev.c b/drivers/net/wireless/rt2x00/rt2x00dev.c
index f7a4417..dc5ab90 100644
--- a/drivers/net/wireless/rt2x00/rt2x00dev.c
+++ b/drivers/net/wireless/rt2x00/rt2x00dev.c
@@ -507,7 +507,7 @@ void rt2x00lib_txdone(struct queue_entry *entry,
 	rt2x00dev->link.qual.tx_success +=
 	    test_bit(TXDONE_SUCCESS, &txdesc->flags);
 	rt2x00dev->link.qual.tx_failed +=
-	    txdesc->retry + !!test_bit(TXDONE_FAILURE, &txdesc->flags);
+	    test_bit(TXDONE_FAILURE, &txdesc->flags);
 
 	/*
 	 * Initialize TX status
diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h
index 884be4d..b19bd16 100644
--- a/net/mac80211/ieee80211_i.h
+++ b/net/mac80211/ieee80211_i.h
@@ -853,27 +853,6 @@ u32 ieee80211_handle_ht(struct ieee80211_local *local, int enable_ht,
 
 /* ieee80211_ioctl.c */
 extern const struct iw_handler_def ieee80211_iw_handler_def;
-
-/* Least common multiple of the used rates (in 100 kbps). This is used to
- * calculate rate_inv values for each rate so that only integers are needed. */
-#define CHAN_UTIL_RATE_LCM 95040
-/* 1 usec is 1/8 * (95040/10) = 1188 */
-#define CHAN_UTIL_PER_USEC 1188
-/* Amount of bits to shift the result right to scale the total utilization
- * to values that will not wrap around 32-bit integers. */
-#define CHAN_UTIL_SHIFT 9
-/* Theoretical maximum of channel utilization counter in 10 ms (stat_time=1):
- * (CHAN_UTIL_PER_USEC * 10000) >> CHAN_UTIL_SHIFT = 23203. So dividing the
- * raw value with about 23 should give utilization in 10th of a percentage
- * (1/1000). However, utilization is only estimated and not all intervals
- * between frames etc. are calculated. 18 seems to give numbers that are closer
- * to the real maximum. */
-#define CHAN_UTIL_PER_10MS 18
-#define CHAN_UTIL_HDR_LONG (202 * CHAN_UTIL_PER_USEC)
-#define CHAN_UTIL_HDR_SHORT (40 * CHAN_UTIL_PER_USEC)
-
-
-/* ieee80211_ioctl.c */
 int ieee80211_set_freq(struct net_device *dev, int freq);
 
 /* ieee80211_sta.c */
-- 
John W. Linville
linville@tuxdriver.com

Re: net-2.6 merged into net-next-2.6

[David Miller]

From: "John W. Linville" <linville@tuxdriver.com>
Date: Tue, 10 Jun 2008 13:47:13 -0400

> The following changes since commit 65b53e4cc90e59936733b3b95b9451d2ca47528d:
>   David S. Miller (1):
>         Merge branch 'master' of master.kernel.org:/.../davem/net-2.6
> 
> are available in the git repository at:
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6.git master
> 
> John W. Linville (2):
>       rt2x00dev.c: fix-up merge damage
>       net/mac80211/ieee80211_i.h: fix-up merge damage

Pulled and pushed back out to net-next-2.6

net-2.6 merged into net-next-2.6

[David Miller]

Just FYI...

net-2.6 merged into net-next-2.6

[David Miller]

I just did a merge, it was mostly clean except for some
wireless bits (some -next work conflicted with the recent
"use_new_eeprom_foo" changes in iwlwifi).

John please take a quick look and see if I made any mistakes.

Thanks.

net-2.6 merged into net-next-2.6

[David Miller]

Just FYI...

net-2.6 merged into net-next-2.6

[David Miller]

To resolve some conflicts I merged net-2.6 into net-next-2.6 just now.

Let me know if this results in any problems, thanks.

net-2.6 merged into net-next-2.6

[David Miller]

To solve some wireless merge hassles and be able to apply some packet
scheduler patches to net-next-2.6 from Patrick McHardy (they depend
upon net-2.6 fixes), I just merged net-next-2.6 into net-2.6

Let me know if I screwed anything up.

net-2.6 merged into net-next-2.6

[David Miller]

I've done this merge to address the merge conflict created
by the skb_header_cloned() revert made to net/mac80211/tx.c

It is possible I screwed this up, so wireless folks should
take a look and send me any fixups.

Thanks.

Re: net-2.6 merged into net-next-2.6

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 456 bytes --]

Hi Dave,

On Thu, 19 Jun 2008 16:06:59 -0700 (PDT) David Miller <davem@davemloft.net> wrote:
>
> I've done this merge to address the merge conflict created
> by the skb_header_cloned() revert made to net/mac80211/tx.c
> 
> It is possible I screwed this up, so wireless folks should
> take a look and send me any fixups.

Thanks, noted.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

net-2.6 merged into net-next-2.6

[David Miller]

In order to address a wireless and an SCTP conflict,
I've merged net-next-2.6 into net-2.6 (again) :-)

Happy hacking.

net-2.6 merged into net-next-2.6...

[David Miller]

In order to resolve some conflicts in wired and wireless
driver stuff, I merged net-2.6 into net-next-2.6

Let me know if I mucked anything up.