old mode 100644new mode 100755.. | .. |
---|
160 | 160 | return BCME_NOMEM; |
---|
161 | 161 | } |
---|
162 | 162 | |
---|
163 | | - ret = dhd_vfs_read(fp, buf, WL_BAD_AP_MAX_BUF_SIZE, &fp->f_pos); |
---|
| 163 | + ret = vfs_read(fp, buf, WL_BAD_AP_MAX_BUF_SIZE, &fp->f_pos); |
---|
164 | 164 | if (ret < 0) { |
---|
165 | 165 | WL_ERR(("%s: file read failed (%d)\n", __FUNCTION__, ret)); |
---|
166 | 166 | goto fail; |
---|
.. | .. |
---|
236 | 236 | fs = get_fs(); |
---|
237 | 237 | set_fs(KERNEL_DS); |
---|
238 | 238 | |
---|
239 | | - fp = dhd_filp_open(fname, O_RDONLY, 0); |
---|
240 | | - if (IS_ERR(fp) || (fp == NULL)) { |
---|
| 239 | + fp = filp_open(fname, O_RDONLY, 0); |
---|
| 240 | + if (IS_ERR(fp)) { |
---|
241 | 241 | fp = NULL; |
---|
242 | 242 | WL_ERR(("%s: file open failed(%d)\n", __FUNCTION__, ret)); |
---|
243 | 243 | goto fail; |
---|
.. | .. |
---|
248 | 248 | } |
---|
249 | 249 | fail: |
---|
250 | 250 | if (fp) { |
---|
251 | | - dhd_filp_close(fp, NULL); |
---|
| 251 | + filp_close(fp, NULL); |
---|
252 | 252 | } |
---|
253 | 253 | set_fs(fs); |
---|
254 | 254 | |
---|
.. | .. |
---|
283 | 283 | fs = get_fs(); |
---|
284 | 284 | set_fs(KERNEL_DS); |
---|
285 | 285 | |
---|
286 | | - fp = dhd_filp_open(fname, O_CREAT | O_RDWR | O_TRUNC, 0666); |
---|
287 | | - if (IS_ERR(fp) || (fp == NULL)) { |
---|
| 286 | + fp = filp_open(fname, O_CREAT | O_RDWR | O_TRUNC, 0666); |
---|
| 287 | + if (IS_ERR(fp)) { |
---|
288 | 288 | ret = PTR_ERR(fp); |
---|
289 | 289 | WL_ERR(("%s: file open failed(%d)\n", __FUNCTION__, ret)); |
---|
290 | 290 | fp = NULL; |
---|
.. | .. |
---|
310 | 310 | #pragma GCC diagnostic pop |
---|
311 | 311 | #endif |
---|
312 | 312 | |
---|
313 | | - ret = dhd_vfs_write(fp, tmp, len, &fp->f_pos); |
---|
| 313 | + ret = vfs_write(fp, tmp, len, &fp->f_pos); |
---|
314 | 314 | if (ret < 0) { |
---|
315 | 315 | WL_ERR(("%s: file write failed(%d)\n", __FUNCTION__, ret)); |
---|
316 | 316 | goto fail; |
---|
317 | 317 | } |
---|
318 | 318 | /* Sync file from filesystem to physical media */ |
---|
319 | | - ret = dhd_vfs_fsync(fp, 0); |
---|
| 319 | + ret = vfs_fsync(fp, 0); |
---|
320 | 320 | if (ret < 0) { |
---|
321 | 321 | WL_ERR(("%s: sync file failed(%d)\n", __FUNCTION__, ret)); |
---|
322 | 322 | goto fail; |
---|
.. | .. |
---|
324 | 324 | ret = BCME_OK; |
---|
325 | 325 | fail: |
---|
326 | 326 | if (fp) { |
---|
327 | | - dhd_filp_close(fp, NULL); |
---|
| 327 | + filp_close(fp, NULL); |
---|
328 | 328 | } |
---|
329 | 329 | set_fs(fs); |
---|
330 | 330 | mutex_unlock(&cfg->bad_ap_mngr.fs_lock); |
---|