diff options
author | Johannes Berg <johannes.berg@intel.com> | 2013-04-12 11:16:36 +0200 |
---|---|---|
committer | Johannes Berg <johannes.berg@intel.com> | 2013-04-15 11:32:46 +0200 |
commit | 4b41a811ad8ee845a1e5964585b7ffa150cd35e3 (patch) | |
tree | 9ac9df3b2c672801ed272967827be1e5019ac67f /backport/backport-include/net | |
parent | e6e140378da05b548ab1797cb080ee27883b947d (diff) |
backports: dissolve compat-3.1.h
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'backport/backport-include/net')
-rw-r--r-- | backport/backport-include/net/genetlink.h | 4 | ||||
-rw-r--r-- | backport/backport-include/net/ip.h | 14 |
2 files changed, 18 insertions, 0 deletions
diff --git a/backport/backport-include/net/genetlink.h b/backport/backport-include/net/genetlink.h index 44ffcafd..630ef898 100644 --- a/backport/backport-include/net/genetlink.h +++ b/backport/backport-include/net/genetlink.h @@ -13,4 +13,8 @@ #define GENLMSG_DEFAULT_SIZE (NLMSG_DEFAULT_SIZE - GENL_HDRLEN) #endif +#if LINUX_VERSION_CODE < KERNEL_VERSION(3,1,0) +#define genl_dump_check_consistent(cb, user_hdr, family) +#endif + #endif /* __BACKPORT_NET_GENETLINK_H */ diff --git a/backport/backport-include/net/ip.h b/backport/backport-include/net/ip.h new file mode 100644 index 00000000..909e6039 --- /dev/null +++ b/backport/backport-include/net/ip.h @@ -0,0 +1,14 @@ +#ifndef __BACKPORT_NET_IP_H +#define __BACKPORT_NET_IP_H +#include_next <net/ip.h> +#include <linux/version.h> + +#if LINUX_VERSION_CODE < KERNEL_VERSION(3,1,0) +/* Backports 56f8a75c */ +static inline bool ip_is_fragment(const struct iphdr *iph) +{ + return (iph->frag_off & htons(IP_MF | IP_OFFSET)) != 0; +} +#endif + +#endif /* __BACKPORT_NET_IP_H */ |