Alexander Duyck a825e00c98 e1000e: swap max hw supported frame size between 82574 and 82583 ...

There appears to have been a mixup in the max supported jumbo frame size
between 82574 and 82583 which ended up disabling jumbo frames on the 82574
as a result.  This patch swaps the two so that this issue is resolved.

This patch fixes http://bugzilla.kernel.org/show_bug.cgi?id=14261

Signed-off-by: Alexander Duyck <alexander.h.duyck@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

2009-10-04 21:08:49 -07:00

..

accessibility

…

acpi

Merge branch 'drm-intel-next' of git://git.kernel.org/pub/scm/linux/kernel/git/anholt/drm-intel

2009-09-24 10:30:41 -07:00

amba

…

ata

…

atm

net: Make setsockopt() optlen be unsigned.

2009-09-30 16:12:20 -07:00

auxdisplay

…

base

…

block

Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus

2009-09-23 09:23:45 -07:00

bluetooth

…

cdrom

sysctl: remove "struct file *" argument of ->proc_handler

2009-09-24 07:21:04 -07:00

char

Merge branch 'drm-intel-next' of git://git.kernel.org/pub/scm/linux/kernel/git/anholt/drm-intel

2009-09-24 10:30:41 -07:00

clocksource

…

connector

connector: Removed the destruct_data callback since it is always kfree_skb()

2009-10-02 10:54:05 -07:00

cpufreq

…

cpuidle

…

crypto

…

dca

…

dio

…

dma

Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx into for-linus

2009-09-23 18:31:11 +10:00

edac

edac: core: remove completion-wait for complete with rcu_barrier

2009-09-24 07:21:05 -07:00

eisa

…

firewire

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6

2009-09-23 09:43:22 -07:00

firmware

…

gpio

Merge branch 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging

2009-09-23 09:30:48 -07:00

gpu

Merge branch 'drm-intel-next' of git://git.kernel.org/pub/scm/linux/kernel/git/anholt/drm-intel

2009-09-24 10:30:41 -07:00

hid

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid

2009-09-22 07:51:28 -07:00

hwmon

Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging

2009-09-23 15:20:16 -07:00

i2c

Merge branch 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging

2009-09-23 09:30:48 -07:00

ide

Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6

2009-09-23 09:32:11 -07:00

idle

…

ieee1394

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6

2009-09-23 09:43:22 -07:00

ieee802154

…

infiniband

walk system ram range

2009-09-23 07:39:41 -07:00

input

input: fix build failures caused by Kconfig Winbond WPCD376I Consumer IR hardware driver Kconfig entry

2009-09-24 07:20:56 -07:00

isdn

net: Make setsockopt() optlen be unsigned.

2009-09-30 16:12:20 -07:00

leds

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

2009-09-23 15:39:36 -07:00

lguest

Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus

2009-09-23 09:23:45 -07:00

macintosh

…

mca

…

md

dm/connector: Only process connector packages from privileged processes

2009-10-02 10:54:10 -07:00

media

Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6

2009-09-24 07:54:16 -07:00

memstick

memstick: move dev_dbg

2009-09-24 07:21:05 -07:00

message

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

2009-09-22 07:51:45 -07:00

mfd

mfd/gpio: add a GPIO interface to the UCB1400 MFD chip driver via gpiolib

2009-09-23 07:39:48 -07:00

misc

gru: allocation may fail in quicktest1()

2009-09-24 07:21:05 -07:00

mmc

Merge branch 'for-linus' of git://neil.brown.name/md

2009-09-24 07:55:29 -07:00

mtd

Merge branch 'for-linus' of git://git.monstr.eu/linux-2.6-microblaze

2009-09-24 09:01:44 -07:00

net

e1000e: swap max hw supported frame size between 82574 and 82583

2009-10-04 21:08:49 -07:00

nubus

…

of

of: remove "stm,m25p40" alias

2009-09-23 07:39:43 -07:00

oprofile

cpumask: use zalloc_cpumask_var() where possible

2009-09-24 09:34:24 +09:30

parisc

…

parport

sysctl: remove "struct file *" argument of ->proc_handler

2009-09-24 07:21:04 -07:00

pci

Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6

2009-09-24 09:57:08 -07:00

pcmcia

…

platform

sony-laptop: re-read the rfkill state when resuming from suspend

2009-09-28 16:55:08 -04:00

pnp

Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6

2009-09-23 09:32:11 -07:00

power

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

2009-09-23 03:49:27 +04:00

pps

…

ps3

…

rapidio

…

regulator

…

rtc

rtc: add boot_timesource sysfs attribute

2009-09-23 07:39:46 -07:00

s390

headers: utsname.h redux

2009-09-23 18:13:10 -07:00

sbus

…

scsi

seq_file: constify seq_operations

2009-09-23 07:39:29 -07:00

serial

serial core: fix new kernel-doc warnings

2009-09-23 11:24:57 -07:00

sfi

…

sh

…

sn

…

spi

spi: handle TX-only/RX-only

2009-09-23 07:39:44 -07:00

ssb

ssb/sdio: fix printk format warnings

2009-09-23 11:35:41 -04:00

staging

pohmelfs/connector: Disallow unpliviged users to configure pohmelfs

2009-10-02 10:54:15 -07:00

tc

…

telephony

…

thermal

…

uio

…

usb

Merge branch 'for-linus' of git://git.monstr.eu/linux-2.6-microblaze

2009-09-24 09:01:44 -07:00

uwb

…

video

uvesafb/connector: Disallow unpliviged users to send netlink packets

2009-10-02 10:54:18 -07:00

virtio

virtio: add virtio IDs file

2009-09-23 22:26:32 +09:30

vlynq

drivers/vlynq/vlynq.c: fix resource size off by 1 error

2009-09-24 07:21:05 -07:00

w1

connector: Provide the sender's credentials to the callback

2009-10-02 10:54:01 -07:00

watchdog

…

xen

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

2009-09-22 07:51:45 -07:00

zorro

…

Kconfig

…

Makefile

Merge git://git.infradead.org/mtd-2.6

2009-09-23 10:07:49 -07:00