Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
---
Andrew, 5 more cleanup patches for -mm on top of the 3 sent earlier
today. Setting the stage for a bit more to come later.
net/mac80211/michael.c | 4 ++--
net/mac80211/michael.h | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/net/mac80211/michael.c b/net/mac80211/michael.c
index a9f5323..30b542e 100644
--- a/net/mac80211/michael.c
+++ b/net/mac80211/michael.c
@@ -27,7 +27,7 @@ static void michael_block(u32 val, struct michael_mic_ctx *mctx)
}
void michael_mic_init(struct michael_mic_ctx *mctx,
- u8 *key, u8 *da, u8 *sa, u8 priority)
+ const u8 *key, const u8 *da, const u8 *sa, u8 priority)
{
mctx->l = get_unaligned_le32(key);
mctx->r = get_unaligned_le32(key + 4);
@@ -40,7 +40,7 @@ void michael_mic_init(struct michael_mic_ctx *mctx,
michael_block(priority, mctx);
}
-void michael_mic(struct michael_mic_ctx *mctx, u8 *data, size_t data_len)
+void michael_mic(struct michael_mic_ctx *mctx, const u8 *data, size_t data_len)
{
u32 val;
size_t block, blocks, left;
diff --git a/net/mac80211/michael.h b/net/mac80211/michael.h
index 5976550..c1a0fc6 100644
--- a/net/mac80211/michael.h
+++ b/net/mac80211/michael.h
@@ -19,9 +19,9 @@ struct michael_mic_ctx {
};
extern void michael_mic_init(struct michael_mic_ctx *mctx,
- u8 *key, u8 *da, u8 *sa, u8 priority);
+ const u8 *key, const u8 *da, const u8 *sa, u8 priority);
extern void michael_mic(struct michael_mic_ctx *mctx,
- u8 *data, size_t data_len);
+ const u8 *data, size_t data_len);
#endif /* MICHAEL_H */
--
1.5.5.144.g3e42
--
| Greg KH | [GIT PATCH] driver core patches against 2.6.24 |
| david | Re: Dual-Licensing Linux Kernel with GPL V2 and GPL V3 |
| Eric Paris | [RFC 0/5] [TALPA] Intro to a linux interface for on access scanning |
| Linus Torvalds | Linux 2.6.25-rc4 |
git: | |
| David Miller | [GIT]: Networking |
| Gerrit Renker | [PATCH 13/37] dccp: Deprecate Ack Ratio sysctl |
| Vladimir Ivashchenko | Re: HTB accuracy for high speed |
| Jarek Poplawski | Re: [PATCH] pkt_sched: Destroy gen estimators under rtnl_lock(). |
