diff --git a/[refs] b/[refs] index 69efa4dfb583..1672cdd0ff43 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5a5a852e45b651c71dfeb3972b30d58742f8941e +refs/heads/master: 1f61ab5ca5cca939a6509892d84b34849e155036 diff --git a/trunk/include/linux/skbuff.h b/trunk/include/linux/skbuff.h index 41753667541d..fcab543d79ac 100644 --- a/trunk/include/linux/skbuff.h +++ b/trunk/include/linux/skbuff.h @@ -273,8 +273,8 @@ struct sk_buff { unsigned int len, data_len, - mac_len, - csum; + mac_len; + __wsum csum; __u32 priority; __u8 local_df:1, cloned:1,