[kernel] r19510 - dists/sid/linux/debian/patches/debian

[Ben Hutchings]

Author: benh
Date: Sun Nov 18 07:06:36 2012
New Revision: 19510

Log:
Hide a compatible rtnetlink ABI change from genksyms

Modified:
   dists/sid/linux/debian/patches/debian/rtnetlink-avoid-ABI-change-in-3.2.34.patch

Modified: dists/sid/linux/debian/patches/debian/rtnetlink-avoid-ABI-change-in-3.2.34.patch
==============================================================================
--- dists/sid/linux/debian/patches/debian/rtnetlink-avoid-ABI-change-in-3.2.34.patch	Sun Nov 18 03:56:22 2012	(r19509)
+++ dists/sid/linux/debian/patches/debian/rtnetlink-avoid-ABI-change-in-3.2.34.patch	Sun Nov 18 07:06:36 2012	(r19510)
@@ -9,6 +9,9 @@
 only one in-tree implementation and it's in the same file as the
 caller, so call it directly with the extra argument when necessary.
 
+Also, the ifla_policy array grew, but this is backward-compatible so
+hide the change from genksyms.
+
 ---
 --- a/include/net/rtnetlink.h
 +++ b/include/net/rtnetlink.h
@@ -23,7 +26,17 @@
  				rtnl_doit_func, rtnl_dumpit_func,
 --- a/net/core/rtnetlink.c
 +++ b/net/core/rtnetlink.c
-@@ -2020,7 +2020,9 @@ static int rtnetlink_rcv_msg(struct sk_b
+@@ -1116,7 +1116,9 @@ const struct nla_policy ifla_policy[IFLA
+ 	[IFLA_VF_PORTS]		= { .type = NLA_NESTED },
+ 	[IFLA_PORT_SELF]	= { .type = NLA_NESTED },
+ 	[IFLA_AF_SPEC]		= { .type = NLA_NESTED },
++#ifndef __GENKSYMS__
+ 	[IFLA_EXT_MASK]		= { .type = NLA_U32 },
++#endif
+ };
+ EXPORT_SYMBOL(ifla_policy);
+ 
+@@ -2020,7 +2022,9 @@ static int rtnetlink_rcv_msg(struct sk_b
  			return -EOPNOTSUPP;
  		calcit = rtnl_get_calcit(family, type);
  		if (calcit)
@@ -34,7 +47,7 @@
  
  		__rtnl_unlock();
  		rtnl = net->rtnl;
-@@ -2136,7 +2138,7 @@ void __init rtnetlink_init(void)
+@@ -2136,7 +2140,7 @@ void __init rtnetlink_init(void)
  	register_netdevice_notifier(&rtnetlink_dev_notifier);
  
  	rtnl_register(PF_UNSPEC, RTM_GETLINK, rtnl_getlink,
@@ -43,3 +56,15 @@
  	rtnl_register(PF_UNSPEC, RTM_SETLINK, rtnl_setlink, NULL, NULL);
  	rtnl_register(PF_UNSPEC, RTM_NEWLINK, rtnl_newlink, NULL, NULL);
  	rtnl_register(PF_UNSPEC, RTM_DELLINK, rtnl_dellink, NULL, NULL);
+--- a/include/linux/if_link.h
++++ b/include/linux/if_link.h
+@@ -137,7 +137,9 @@ enum {
+ 	IFLA_AF_SPEC,
+ 	IFLA_GROUP,		/* Group the device belongs to */
+ 	IFLA_NET_NS_FD,
++#ifndef __GENKSYMS__
+ 	IFLA_EXT_MASK,		/* Extended info mask, VFs, etc */
++#endif
+ 	__IFLA_MAX
+ };
+