Linux kernel stable tree https://git.rulkc.org/pub/scm/linux/kernel/git/stable/linux.git/atom?h=master 2011-08-12T07:22:12+00:00 2011-08-12T07:22:12+00:00 Jeff Kirsher jeffrey.t.kirsher@intel.com 2011-06-11T09:29:36+00:00 urn:sha1:ec21e2ec367697b4803e82662bdff6c8567745fc Move the Freescale drivers into drivers/net/ethernet/freescale/ and make the necessary Kconfig and Makefile changes. CC: Sandeep Gopalpet <sandeep.kumar@freescale.com> CC: Andy Fleming <afleming@freescale.com> CC: Shlomi Gridish <gridish@freescale.com> CC: Li Yang <leoli@freescale.com> CC: Pantelis Antoniou <pantelis.antoniou@gmail.com> CC: Vitaly Bordug <vbordug@ru.mvista.com> CC: Dan Malek <dmalek@jlc.net> CC: Sylvain Munaut <tnt@246tNt.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> 2011-07-21T20:47:55+00:00 Jiri Pirko jpirko@redhat.com 2011-07-20T04:54:19+00:00 urn:sha1:87c288c6e9aa31720b72e2bc2d665e24e1653c3e - unify vlan and nonvlan rx path - kill priv->vlgrp and gfar_vlan_rx_register - allow to turn on/off rx/tx vlan accel via ethtool Signed-off-by: Jiri Pirko <jpirko@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net> 2011-07-21T20:38:42+00:00 David S. Miller davem@davemloft.net 2011-07-21T20:38:42+00:00 urn:sha1:033b1142f4bd44a116d1356fe4a0510437ceddf9 Conflicts: net/bluetooth/l2cap_core.c 2011-07-15T23:00:20+00:00 Sebastian Pöhn sebastian.belden@googlemail.com 2011-07-15T23:00:20+00:00 urn:sha1:f3dc1586375c3fa061c4867e8b076d09a53beb03 Only let the rx parser be enabled if it is necessary (if VLAN extraction, IP or TCP checksumming or the rx queue filer are enabled). Otherwise disable it. The new routine gfar_check_rx_parser_mode should be run after every change on this features and will enable/disable the parser as necessary. Signed-off-by: Jiri Pirko <jpirko@redhat.com> Signed-off-by: Sebastian Poehn <sebastian.poehn@belden.com> Signed-off-by: David S. Miller <davem@davemloft.net> 2011-07-07T11:30:29+00:00 Sebastian Poehn sebastian.poehn@belden.com 2011-07-07T11:30:29+00:00 urn:sha1:380b153cf59a5610ca97319fdb9601b8c453ece0 This patch: # improves readability of some gianfar nfc code Signed-off-by: Sebastian Poehn <sebastian.poehn@belden.com> Signed-off-by: David S. Miller <davem@davemloft.net> 2011-06-21T05:29:08+00:00 David S. Miller davem@davemloft.net 2011-06-21T05:29:08+00:00 urn:sha1:9f6ec8d697c08963d83880ccd35c13c5ace716ea Conflicts: drivers/net/wireless/iwlwifi/iwl-agn-rxon.c drivers/net/wireless/rtlwifi/pci.c net/netfilter/ipvs/ip_vs_core.c 2011-06-20T20:57:59+00:00 Sebastian Poehn sebastian.poehn@belden.com 2011-06-20T20:57:59+00:00 urn:sha1:4aa3a715551c93eda32d79bd52042ce500bd5383 This patch adds all missing functionalities for nfc except GRXFH. There is so much code because hardware has not a TCAM. Further hardware rule space is very limited. So I had to extensively use optimization features. Both reasons lead to the necessity to hold all online flows in a linked-list. Change-log: # Some suggestions by Joe Perches applied (thanks!) # Shorted some logs # Use memcmp() for comparing Signed-off-by: Sebastian Poehn <sebastian.poehn@belden.com> Signed-off-by: David S. Miller <davem@davemloft.net> 2011-06-09T07:12:57+00:00 Wu Jiajun-B06378 B06378@freescale.com 2011-06-07T21:46:51+00:00 urn:sha1:6c43e0465f56248d9da56f2c4665ce1696766814 Each eTSEC device should own localized filer table. Signed-off-by: Jiajun Wu <b06378@freescale.com> Signed-off-by: David S. Miller <davem@davemloft.net> 2011-04-15T22:50:41+00:00 Michał Mirosław mirq-linux@rere.qmqm.pl 2011-04-15T04:50:50+00:00 urn:sha1:8b3afe95e363dbd32bd9ddc6c2d562944f5350c5 Note: I bet that gfar_set_features() don't really need a full reset. Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl> Signed-off-by: David S. Miller <davem@davemloft.net> 2011-04-11T20:44:25+00:00 David S. Miller davem@davemloft.net 2011-04-11T20:44:25+00:00 urn:sha1:1c01a80cfec6f806246f31ff2680cd3639b30e67 Conflicts: drivers/net/smsc911x.c