net: Move network device exit batching

[safe/jmp/linux-2.6] / net / mac80211 / rc80211_minstrel_debugfs.c

diff --git a/net/mac80211/rc80211_minstrel_debugfs.c b/net/mac80211/rc80211_minstrel_debugfs.c
index 0b024cd..a715d94 100644 (file)
--- a/net/mac80211/rc80211_minstrel_debugfs.c
+++ b/net/mac80211/rc80211_minstrel_debugfs.c
@@ -83,7 +83,7 @@ minstrel_stats_open(struct inode *inode, struct file *file)
                p += sprintf(p, "%3u%s", mr->bitrate / 2,
                                (mr->bitrate & 1 ? ".5" : "  "));
 
-               tp = ((mr->cur_tp * 96) / 18000) >> 10;
+               tp = mr->cur_tp / ((18000 << 10) / 96);
                prob = mr->cur_prob / 18;
                eprob = mr->probability / 18;
 
@@ -94,8 +94,8 @@ minstrel_stats_open(struct inode *inode, struct file *file)
                                prob / 10, prob % 10,
                                mr->last_success,
                                mr->last_attempts,
-                               mr->succ_hist,
-                               mr->att_hist);
+                               (unsigned long long)mr->succ_hist,
+                               (unsigned long long)mr->att_hist);
        }
        p += sprintf(p, "\nTotal packet count::    ideal %d      "
                        "lookaround %d\n\n",
@@ -106,7 +106,7 @@ minstrel_stats_open(struct inode *inode, struct file *file)
        return 0;
 }
 
-static int
+static ssize_t
 minstrel_stats_read(struct file *file, char __user *buf, size_t len, loff_t *o)
 {
        struct minstrel_stats_info *ms;
@@ -139,7 +139,7 @@ minstrel_stats_release(struct inode *inode, struct file *file)
        return 0;
 }
 
-static struct file_operations minstrel_stat_fops = {
+static const struct file_operations minstrel_stat_fops = {
        .owner = THIS_MODULE,
        .open = minstrel_stats_open,
        .read = minstrel_stats_read,