diff --git a/[refs] b/[refs] index 33efad46924b..5265d8eab2e6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: beb2a7f331361bfe81e71acdb0739eae570475a2 +refs/heads/master: 627271018df75c8861b9e75b39d5995842e6ec95 diff --git a/trunk/include/net/mac80211.h b/trunk/include/net/mac80211.h index 0dbbfc7b0509..6a1d4ea18186 100644 --- a/trunk/include/net/mac80211.h +++ b/trunk/include/net/mac80211.h @@ -341,6 +341,7 @@ struct ieee80211_tx_info { u8 antenna_sel_tx; /* 2 byte hole */ + u8 pad[2]; union { struct {