Merge master.kernel.org:/pub/scm/linux/kernel/git/acme/net-2.6 (912cbe3c) · Commits · e / devices / android_kernel_xiaomi_nabu

Documentation/DocBook/kernel-api.tmpl

+3 −3

Original line number	Diff line number	Diff line
		@@ -239,9 +239,9 @@ X!Ilib/string.c
		<title>Network device support</title>
		<sect1><title>Driver Support</title>
		!Enet/core/dev.c
		</sect1>
		<sect1><title>8390 Based Network Cards</title>
		!Edrivers/net/8390.c
		!Enet/ethernet/eth.c
		!Einclude/linux/etherdevice.h
		!Enet/core/wireless.c
		</sect1>
		<sect1><title>Synchronous PPP</title>
		!Edrivers/net/wan/syncppp.c

include/linux/etherdevice.h

+16 −11

Original line number	Diff line number	Diff line
		@@ -48,8 +48,10 @@ static inline void eth_copy_and_sum (struct sk_buff *dest,
		}

		/**
		* is_zero_ether_addr - Determine if give Ethernet address is all
		* zeros.
		* is_zero_ether_addr - Determine if give Ethernet address is all zeros.
		* @addr: Pointer to a six-byte array containing the Ethernet address
		*
		* Return true if the address is all zeroes.
		*/
		static inline int is_zero_ether_addr(const u8 *addr)
		{
		@@ -57,9 +59,7 @@ static inline int is_zero_ether_addr(const u8 *addr)
		}

		/**
		* is_multicast_ether_addr - Determine if the given Ethernet address is a
		* multicast address.
		*
		* is_multicast_ether_addr - Determine if the Ethernet address is a multicast.
		* @addr: Pointer to a six-byte array containing the Ethernet address
		*
		* Return true if the address is a multicast address.
		@@ -69,10 +69,15 @@ static inline int is_multicast_ether_addr(const u8 *addr)
		return ((addr[0] != 0xff) && (0x01 & addr[0]));
		}

		/**
		* is_broadcast_ether_addr - Determine if the Ethernet address is broadcast
		* @addr: Pointer to a six-byte array containing the Ethernet address
		*
		* Return true if the address is the broadcast address.
		*/
		static inline int is_broadcast_ether_addr(const u8 *addr)
		{
		return ((addr[0] == 0xff) && (addr[1] == 0xff) && (addr[2] == 0xff) &&
		(addr[3] == 0xff) && (addr[4] == 0xff) && (addr[5] == 0xff));
		return (addr[0] & addr[1] & addr[2] & addr[3] & addr[4] & addr[5]) == 0xff;
		}

		/**
		@@ -108,14 +113,14 @@ static inline void random_ether_addr(u8 *addr)
		/**
		* compare_ether_addr - Compare two Ethernet addresses
		* @addr1: Pointer to a six-byte array containing the Ethernet address
		* @addr2 Pointer other six-byte array containing the Ethernet address
		* @addr2: Pointer other six-byte array containing the Ethernet address
		*
		* Compare two ethernet addresses, returns 0 if equal
		*/
		static inline unsigned compare_ether_addr(const u8 _a, const u8 _b)
		static inline unsigned compare_ether_addr(const u8 addr1, const u8 addr2)
		{
		const u16 a = (const u16 ) _a;
		const u16 b = (const u16 ) _b;
		const u16 a = (const u16 ) addr1;
		const u16 b = (const u16 ) addr2;

		BUILD_BUG_ON(ETH_ALEN != 6);
		return ((a[0] ^ b[0]) \| (a[1] ^ b[1]) \| (a[2] ^ b[2])) != 0;

net/core/datagram.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -213,6 +213,10 @@ int skb_copy_datagram_iovec(const struct sk_buff *skb, int offset,
		{
		int i, err, fraglen, end = 0;
		struct sk_buff *next = skb_shinfo(skb)->frag_list;

		if (!len)
		return 0;

		next_skb:
		fraglen = skb_headlen(skb);
		i = -1;

net/ipv4/igmp.c

+4 −1

Original line number	Diff line number	Diff line
		@@ -1908,8 +1908,11 @@ int ip_mc_msfilter(struct sock sk, struct ip_msfilter msf, int ifindex)
		sock_kfree_s(sk, newpsl, IP_SFLSIZE(newpsl->sl_max));
		goto done;
		}
		} else
		} else {
		newpsl = NULL;
		(void) ip_mc_add_src(in_dev, &msf->imsf_multiaddr,
		msf->imsf_fmode, 0, NULL, 0);
		}
		psl = pmc->sflist;
		if (psl) {
		(void) ip_mc_del_src(in_dev, &msf->imsf_multiaddr, pmc->sfmode,

net/ipv4/tcp_bic.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -27,7 +27,7 @@
		*/

		static int fast_convergence = 1;
		static int max_increment = 32;
		static int max_increment = 16;
		static int low_window = 14;
		static int beta = 819; /* = 819/1024 (BICTCP_BETA_SCALE) */
		static int low_utilization_threshold = 153;