diff --git a/[refs] b/[refs] index 8c06fccc3165..6c7c22ba12b7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b5c5693bb723a019deac3cd1345f3e7233c8a67e +refs/heads/master: 96c131842aab45b5d139d0bcb417796819f5ee92 diff --git a/trunk/include/linux/if_packet.h b/trunk/include/linux/if_packet.h index 5e76988f8ffc..f3799295d231 100644 --- a/trunk/include/linux/if_packet.h +++ b/trunk/include/linux/if_packet.h @@ -173,7 +173,7 @@ struct tpacket_hdr_v1 { * you can see which blk[s] is[are] outstanding etc. * 3. Validate kernel code. */ - aligned_u64 seq_num; + __aligned_u64 seq_num; /* * ts_last_pkt: