Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 (d9993be6) · Commits · e / devices / android_kernel_xiaomi_nabu

drivers/net/typhoon.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -1004,7 +1004,6 @@ typhoon_get_drvinfo(struct net_device dev, struct ethtool_drvinfo info)
		}

		strcpy(info->driver, KBUILD_MODNAME);
		strcpy(info->version, UTS_RELEASE);
		strcpy(info->bus_info, pci_name(pci_dev));
		}

+10 −2

Original line number	Diff line number	Diff line
		/*
		* MOSCHIP MCS7830 based USB 2.0 Ethernet Devices
		* MOSCHIP MCS7830 based (7730/7830/7832) USB 2.0 Ethernet Devices
		*
		* based on usbnet.c, asix.c and the vendor provided mcs7830 driver
		*
		@@ -11,6 +11,9 @@
		*
		* Definitions gathered from MOSCHIP, Data Sheet_7830DA.pdf (thanks!).
		*
		* 2010-12-19: add 7832 USB PID ("functionality same as MCS7830"),
		* per active notification by manufacturer
		*
		* TODO:
		* - support HIF_REG_CONFIG_SLEEPMODE/HIF_REG_CONFIG_TXENABLE (via autopm?)
		* - implement ethtool_ops get_pauseparam/set_pauseparam
		@@ -60,6 +63,7 @@
		#define MCS7830_MAX_MCAST 64

		#define MCS7830_VENDOR_ID 0x9710
		#define MCS7832_PRODUCT_ID 0x7832
		#define MCS7830_PRODUCT_ID 0x7830
		#define MCS7730_PRODUCT_ID 0x7730

		@@ -626,7 +630,7 @@ static int mcs7830_rx_fixup(struct usbnet dev, struct sk_buff skb)
		}

		static const struct driver_info moschip_info = {
		.description = "MOSCHIP 7830/7730 usb-NET adapter",
		.description = "MOSCHIP 7830/7832/7730 usb-NET adapter",
		.bind = mcs7830_bind,
		.rx_fixup = mcs7830_rx_fixup,
		.flags = FLAG_ETHER,
		@@ -644,6 +648,10 @@ static const struct driver_info sitecom_info = {
		};

		static const struct usb_device_id products[] = {
		{
		USB_DEVICE(MCS7830_VENDOR_ID, MCS7832_PRODUCT_ID),
		.driver_info = (unsigned long) &moschip_info,
		},
		{
		USB_DEVICE(MCS7830_VENDOR_ID, MCS7830_PRODUCT_ID),
		.driver_info = (unsigned long) &moschip_info,

+10 −0

Original line number	Diff line number	Diff line
		@@ -175,5 +175,15 @@ static inline int ipv6_unicast_destination(struct sk_buff *skb)
		return rt->rt6i_flags & RTF_LOCAL;
		}

		int ip6_fragment(struct sk_buff skb, int (output)(struct sk_buff *));

		static inline int ip6_skb_dst_mtu(struct sk_buff *skb)
		{
		struct ipv6_pinfo *np = skb->sk ? inet6_sk(skb->sk) : NULL;

		return (np && np->pmtudisc == IPV6_PMTUDISC_PROBE) ?
		skb_dst(skb)->dev->mtu : dst_mtu(skb_dst(skb));
		}

		#endif
		#endif

+1 −5

Original line number	Diff line number	Diff line
		@@ -611,10 +611,6 @@ static inline struct sk_buff skb_act_clone(struct sk_buff skb, gfp_t gfp_mask,
		{
		struct sk_buff *n;

		if ((action == TC_ACT_STOLEN \|\| action == TC_ACT_QUEUED) &&
		!skb_shared(skb))
		n = skb_get(skb);
		else
		n = skb_clone(skb, gfp_mask);

		if (n) {

+2 −10

Original line number	Diff line number	Diff line
		@@ -56,7 +56,7 @@
		#include <net/checksum.h>
		#include <linux/mroute6.h>

		static int ip6_fragment(struct sk_buff skb, int (output)(struct sk_buff *));
		int ip6_fragment(struct sk_buff skb, int (output)(struct sk_buff *));

		int __ip6_local_out(struct sk_buff *skb)
		{
		@@ -145,14 +145,6 @@ static int ip6_finish_output2(struct sk_buff *skb)
		return -EINVAL;
		}

		static inline int ip6_skb_dst_mtu(struct sk_buff *skb)
		{
		struct ipv6_pinfo *np = skb->sk ? inet6_sk(skb->sk) : NULL;

		return (np && np->pmtudisc == IPV6_PMTUDISC_PROBE) ?
		skb_dst(skb)->dev->mtu : dst_mtu(skb_dst(skb));
		}

		static int ip6_finish_output(struct sk_buff *skb)
		{
		if ((skb->len > ip6_skb_dst_mtu(skb) && !skb_is_gso(skb)) \|\|
		@@ -601,7 +593,7 @@ int ip6_find_1stfragopt(struct sk_buff skb, u8 *nexthdr)
		return offset;
		}

		static int ip6_fragment(struct sk_buff skb, int (output)(struct sk_buff *))
		int ip6_fragment(struct sk_buff skb, int (output)(struct sk_buff *))
		{
		struct sk_buff *frag;
		struct rt6_info rt = (struct rt6_info)skb_dst(skb);