diff --git a/[refs] b/[refs] index dd1a7f3fe57c..97be3c9cfea3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 20c3d7f71d31aff167bb4a8c536df3e6bd85dd9e +refs/heads/master: 94c97e8e0692ee3a58868a013b973fcf7fed348c diff --git a/trunk/drivers/staging/rtl8187se/ieee80211/ieee80211_tx.c b/trunk/drivers/staging/rtl8187se/ieee80211/ieee80211_tx.c index 6cb31e1760ac..552115cd760e 100644 --- a/trunk/drivers/staging/rtl8187se/ieee80211/ieee80211_tx.c +++ b/trunk/drivers/staging/rtl8187se/ieee80211/ieee80211_tx.c @@ -445,7 +445,7 @@ int ieee80211_rtl_xmit(struct sk_buff *skb, (CFG_IEEE80211_COMPUTE_FCS | CFG_IEEE80211_RESERVE_FCS)) bytes_per_frag -= IEEE80211_FCS_LEN; - /* Each fragment may need to have room for encryptiong pre/postfix */ + /* Each fragment may need to have room for encryption pre/postfix */ if (encrypt) bytes_per_frag -= crypt->ops->extra_prefix_len + crypt->ops->extra_postfix_len; diff --git a/trunk/drivers/staging/rtl8192e/ieee80211/ieee80211_tx.c b/trunk/drivers/staging/rtl8192e/ieee80211/ieee80211_tx.c index de2ed7261a71..424dd48da661 100644 --- a/trunk/drivers/staging/rtl8192e/ieee80211/ieee80211_tx.c +++ b/trunk/drivers/staging/rtl8192e/ieee80211/ieee80211_tx.c @@ -761,7 +761,7 @@ int ieee80211_rtl_xmit(struct sk_buff *skb, struct net_device *dev) (CFG_IEEE80211_COMPUTE_FCS | CFG_IEEE80211_RESERVE_FCS)) bytes_per_frag -= IEEE80211_FCS_LEN; - /* Each fragment may need to have room for encryptiong pre/postfix */ + /* Each fragment may need to have room for encryption pre/postfix */ if (encrypt) bytes_per_frag -= crypt->ops->extra_prefix_len + crypt->ops->extra_postfix_len; diff --git a/trunk/drivers/staging/rtl8192u/ieee80211/ieee80211_tx.c b/trunk/drivers/staging/rtl8192u/ieee80211/ieee80211_tx.c index ec7845ecdb7e..59c45a510efb 100644 --- a/trunk/drivers/staging/rtl8192u/ieee80211/ieee80211_tx.c +++ b/trunk/drivers/staging/rtl8192u/ieee80211/ieee80211_tx.c @@ -723,7 +723,7 @@ int ieee80211_xmit(struct sk_buff *skb, struct net_device *dev) (CFG_IEEE80211_COMPUTE_FCS | CFG_IEEE80211_RESERVE_FCS)) bytes_per_frag -= IEEE80211_FCS_LEN; - /* Each fragment may need to have room for encryptiong pre/postfix */ + /* Each fragment may need to have room for encryption pre/postfix */ if (encrypt) bytes_per_frag -= crypt->ops->extra_prefix_len + crypt->ops->extra_postfix_len;