Merge branch 'master'

diff --combined drivers/net/Kconfig
index e2d5b77764a238f4c1b5fac709c2864ba485004c,5c69d57f8548aa41b84f45e5cf2101fa80f47d64..1579041f73fc095781c4c58ee824d07eff774343
--- 1/drivers/net/Kconfig
--- 2/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@@ -447,7 -447,7 +447,7 @@@ config NET_SB1250_MA
  
  config SGI_IOC3_ETH
        bool "SGI IOC3 Ethernet"
-       depends on NET_ETHERNET && PCI && SGI_IP27 && BROKEN
+       depends on NET_ETHERNET && PCI && SGI_IP27
        select CRC32
        select MII
        help
@@@ -2008,25 -2008,7 +2008,25 @@@ config SKG
  
          It does not support the link failover and network management 
          features that "portable" vendor supplied sk98lin driver does.
 -      
 +
 +
 +config SKY2
 +      tristate "SysKonnect Yukon2 support (EXPERIMENTAL)"
 +      depends on PCI && EXPERIMENTAL
 +      select CRC32
 +      ---help---
 +        This driver support the Marvell Yukon 2 Gigabit Ethernet adapter.
 +
 +        To compile this driver as a module, choose M here: the module
 +        will be called sky2.  This is recommended.
 +
 +config SKY2_EC_A1
 +      bool "Support old Yukon-EC A1 chipset"
 +      depends on SKY2
 +      ---help---
 +        Include support for early revisions of the Yukon EC chipset
 +        that required extra workarounds. If in doubt, say N.
 +
  config SK98LIN
        tristate "Marvell Yukon Chipset / SysKonnect SK-98xx Support"
        depends on PCI
@@@ -2541,6 -2523,19 +2541,19 @@@ config PPP_BSDCOM
          module; it is called bsd_comp and will show up in the directory
          modules once you have said "make modules". If unsure, say N.
  
+ config PPP_MPPE
+        tristate "PPP MPPE compression (encryption) (EXPERIMENTAL)"
+        depends on PPP && EXPERIMENTAL
+        select CRYPTO
+        select CRYPTO_SHA1
+        select CRYPTO_ARC4
+        ---help---
+          Support for the MPPE Encryption protocol, as employed by the
+        Microsoft Point-to-Point Tunneling Protocol.
+ 
+        See http://pptpclient.sourceforge.net/ for information on
+        configuring PPTP clients and servers to utilize this method.
+ 
  config PPPOE
        tristate "PPP over Ethernet (EXPERIMENTAL)"
        depends on EXPERIMENTAL && PPP

diff --combined drivers/net/Makefile
index 5dccac434d486b0cf91207182a432d7568d6f513,4cffd34442aafaddc00865df86c26f410ccd61a2..27822a2f06837310ee101449270bd4c879416653
--- 1/drivers/net/Makefile
--- 2/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@@ -59,7 -59,6 +59,7 @@@ spidernet-y += spider_net.o spider_net_
  obj-$(CONFIG_SPIDER_NET) += spidernet.o
  obj-$(CONFIG_TC35815) += tc35815.o
  obj-$(CONFIG_SKGE) += skge.o
 +obj-$(CONFIG_SKY2) += sky2.o
  obj-$(CONFIG_SK98LIN) += sk98lin/
  obj-$(CONFIG_SKFP) += skfp/
  obj-$(CONFIG_VIA_RHINE) += via-rhine.o
@@@ -113,6 -112,7 +113,7 @@@ obj-$(CONFIG_PPP_ASYNC) += ppp_async.
  obj-$(CONFIG_PPP_SYNC_TTY) += ppp_synctty.o
  obj-$(CONFIG_PPP_DEFLATE) += ppp_deflate.o
  obj-$(CONFIG_PPP_BSDCOMP) += bsd_comp.o
+ obj-$(CONFIG_PPP_MPPE) += ppp_mppe.o
  obj-$(CONFIG_PPPOE) += pppox.o pppoe.o
  
  obj-$(CONFIG_SLIP) += slip.o

diff --combined include/linux/netdevice.h
index b72f756542d037e54ad41a7468f2776a7d7ad104,936f8b76114ea95901ccb74190f2ebc96fc2a3a7..97bbca6b29602a00ec18f53865c47bc2c1a1e0d1
--- 1/include/linux/netdevice.h
--- 2/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@@ -802,15 -802,11 +802,15 @@@ static inline u32 netif_msg_init(int de
  }
  
  /* Schedule rx intr now? */
 +static inline int netif_rx_schedule_test(struct net_device *dev)
 +{
 +      return !test_and_set_bit(__LINK_STATE_RX_SCHED, &dev->state);
 +}
  
 +/* Schedule only if device is up */
  static inline int netif_rx_schedule_prep(struct net_device *dev)
  {
 -      return netif_running(dev) &&
 -              !test_and_set_bit(__LINK_STATE_RX_SCHED, &dev->state);
 +      return netif_running(dev) && netif_rx_schedule_test(dev);
  }
  
  /* Add interface to tail of rx poll list. This assumes that _prep has
@@@ -931,6 -927,13 +931,13 @@@ extern int               netdev_max_backlog
  extern int            weight_p;
  extern int            netdev_set_master(struct net_device *dev, struct net_device *master);
  extern int skb_checksum_help(struct sk_buff *skb, int inward);
+ #ifdef CONFIG_BUG
+ extern void netdev_rx_csum_fault(struct net_device *dev);
+ #else
+ static inline void netdev_rx_csum_fault(struct net_device *dev)
+ {
+ }
+ #endif
  /* rx skb timestamps */
  extern void           net_enable_timestamp(void);
  extern void           net_disable_timestamp(void);