Skip to content

Commit

Permalink
mac80211: fix maximum MTU
Browse files Browse the repository at this point in the history
The maximum MTU shouldn't take the headers into account,
the maximum MSDU size is exactly the maximum MTU.

Signed-off-by: T Krishna Chaitanya <chaitanyatk@posedge.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
  • Loading branch information
Chaitanya authored and Johannes Berg committed Jan 3, 2013
1 parent 826262c commit 09b1426
Showing 1 changed file with 1 addition and 10 deletions.
11 changes: 1 addition & 10 deletions net/mac80211/iface.c
Original file line number Diff line number Diff line change
Expand Up @@ -207,17 +207,8 @@ void ieee80211_recalc_idle(struct ieee80211_local *local)

static int ieee80211_change_mtu(struct net_device *dev, int new_mtu)
{
int meshhdrlen;
struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);

meshhdrlen = (sdata->vif.type == NL80211_IFTYPE_MESH_POINT) ? 5 : 0;

/* FIX: what would be proper limits for MTU?
* This interface uses 802.3 frames. */
if (new_mtu < 256 ||
new_mtu > IEEE80211_MAX_DATA_LEN - 24 - 6 - meshhdrlen) {
if (new_mtu < 256 || new_mtu > IEEE80211_MAX_DATA_LEN)
return -EINVAL;
}

dev->mtu = new_mtu;
return 0;
Expand Down

0 comments on commit 09b1426

Please sign in to comment.