Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 78697
b: refs/heads/master
c: 6d65f5d
h: refs/heads/master
i:
  78695: 7ea8df3
v: v3
  • Loading branch information
Johannes Berg authored and David S. Miller committed Jan 28, 2008
1 parent 33d0570 commit c193655
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 1036d8642b6bb604774ea143120fe10ede4ab078
refs/heads/master: 6d65f5db2f66e3ff44df759fbbb3c7482879fb1e
3 changes: 1 addition & 2 deletions trunk/net/mac80211/tx.c
Original file line number Diff line number Diff line change
Expand Up @@ -932,7 +932,6 @@ __ieee80211_tx_prepare(struct ieee80211_txrx_data *tx,
struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);
struct ieee80211_hdr *hdr;
struct ieee80211_sub_if_data *sdata;
ieee80211_txrx_result res = TXRX_CONTINUE;

int hdrlen;

Expand Down Expand Up @@ -997,7 +996,7 @@ __ieee80211_tx_prepare(struct ieee80211_txrx_data *tx,
}
control->flags |= IEEE80211_TXCTL_FIRST_FRAGMENT;

return res;
return TXRX_CONTINUE;
}

/* Device in tx->dev has a reference added; use dev_put(tx->dev) when
Expand Down

0 comments on commit c193655

Please sign in to comment.