diff options
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/inet_lro.h | 3 | ||||
| -rw-r--r-- | include/linux/jbd.h | 2 | ||||
| -rw-r--r-- | include/linux/proc_fs.h | 1 |
3 files changed, 5 insertions, 1 deletions
diff --git a/include/linux/inet_lro.h b/include/linux/inet_lro.h index 1246d46abbc..80335b7d77c 100644 --- a/include/linux/inet_lro.h +++ b/include/linux/inet_lro.h @@ -91,6 +91,9 @@ struct net_lro_mgr { int max_desc; /* Max number of LRO descriptors */ int max_aggr; /* Max number of LRO packets to be aggregated */ + int frag_align_pad; /* Padding required to properly align layer 3 + * headers in generated skb when using frags */ + struct net_lro_desc *lro_arr; /* Array of LRO descriptors */ /* diff --git a/include/linux/jbd.h b/include/linux/jbd.h index 16e7ed855a1..d9ecd13393b 100644 --- a/include/linux/jbd.h +++ b/include/linux/jbd.h @@ -439,6 +439,8 @@ struct transaction_s /* * Transaction's current state * [no locking - only kjournald alters this] + * [j_list_lock] guards transition of a transaction into T_FINISHED + * state and subsequent call of __journal_drop_transaction() * FIXME: needs barriers * KLUDGE: [use j_state_lock] */ diff --git a/include/linux/proc_fs.h b/include/linux/proc_fs.h index 523528d237b..a5316829215 100644 --- a/include/linux/proc_fs.h +++ b/include/linux/proc_fs.h @@ -77,7 +77,6 @@ struct proc_dir_entry { read_proc_t *read_proc; write_proc_t *write_proc; atomic_t count; /* use count */ - int deleted; /* delete flag */ int pde_users; /* number of callers into module in progress */ spinlock_t pde_unload_lock; /* proc_fops checks and pde_users bumps */ struct completion *pde_unload_completion; |